avr/avrdude
2
0
Fork 0
mirror of https://github.com/mariusgreuel/avrdude.git synced 2025-12-18 03:14:42 +00:00
Code Issues Projects Releases Wiki Activity

Harden string processing during parsing in lexer.l, config_gram.y and otherwise

Browse Source 
- Replace strdup(s) with cfg_strdup(funname, s) that exits on out of mem
 - Replace malloc(n) with cfg_malloc(funname, n) that exits on out of mem
 - Change multiline string scanning in lexer.l to avoid core dump
 - Remove global variables string_buf and string_bug_ptr
 - Ensure reading strings unescapes strings C-Style
 - Ensure writing strings escapes strings C-Style again

Commit looks longer than needed as unescape() and auxiliary functions needed
to be moved from term.c (not in libavrdude) to config.c (in libavrdude).
This commit is contained in:
Stefan Rueger
2022-08-09 21:20:44 +01:00
parent 8a717987ec
commit 22c4dbf23e
14 changed files with 355 additions and 402 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/config.h
View File

@@ -35,11 +35,11 @@
enum { V_NONE, V_NUM, V_NUM_REAL, V_STR };
typedef struct value_t {
int type;
/*union { TODO: use an anonymous union here ? */
union {
int number;
double number_real;
char * string;
/*};*/
};
} VALUE;
@@ -66,41 +66,36 @@ extern bool is_alias; // current entry is alias
#endif
extern YYSTYPE yylval;
extern char string_buf[MAX_STR_CONST];
extern char *string_buf_ptr;
#ifdef __cplusplus
extern "C" {
#endif
int yyparse(void);
int yyerror(char * errmsg, ...);
int yyerror(char *errmsg, ...);
int yywarning(char * errmsg, ...);
int yywarning(char *errmsg, ...);
TOKEN * new_token(int primary);
TOKEN *new_token(int primary);
void free_token(TOKEN * tkn);
void free_token(TOKEN *tkn);
void free_tokens(int n, ...);
TOKEN * number(char * text);
TOKEN *number(const char *text);
TOKEN * number_real(char * text);
TOKEN *number_real(const char *text);
TOKEN * hexnumber(char * text);
TOKEN *hexnumber(const char *text);
TOKEN * string(char * text);
TOKEN *string(const char *text);
TOKEN * keyword(int primary);
TOKEN *keyword(int primary);
void print_token(TOKEN * tkn);
void print_token(TOKEN *tkn);
void pyytext(void);
char * dup_string(const char * str);
int capture_comment_char(int c);
#ifdef __cplusplus