DeforaOS/CPP
DeforaOS/CPP
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed bug with empty quoted strings

Browse Source
This commit is contained in:
Pierre Pronchery 2008-02-26 13:03:53 +00:00
parent 7b054a571a
commit 263dc1ada4
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/cpp.c
View File

@ -365,11 +365,10 @@ static int _quote_escape(int c);
static int _cpp_callback_quote(Parser * parser, Token * token, int c, static int _cpp_callback_quote(Parser * parser, Token * token, int c,
void * data) void * data)
/* FIXME bug with "" => " */
{ {
const int d = c; const int d = c;
char * str = NULL; char * str = NULL;
size_t len = 1; size_t len = 0;
char * p; char * p;
if(c == '\'') if(c == '\'')
@ -381,26 +380,23 @@ static int _cpp_callback_quote(Parser * parser, Token * token, int c,
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "DEBUG: cpp_callback_quote('%c')\n", c); fprintf(stderr, "DEBUG: cpp_callback_quote('%c')\n", c);
#endif #endif
while((c = parser_scan_filter(parser)) != EOF && c != d) while((p = realloc(str, len + 3)) != NULL)
{ {
if((p = realloc(str, len + 3)) == NULL)
break;
str = p; str = p;
if(c == '\\')
{
if((c = parser_scan_filter(parser)) == EOF)
break;
else
c = _quote_escape(c);
}
str[len++] = c; str[len++] = c;
if((c = parser_scan_filter(parser)) == EOF || c == d)
break; /* unexpected end of file or end of string */
if(c != '\\')
continue; /* character is not escaped */
if((c = parser_scan_filter(parser)) == EOF)
break;
c = _quote_escape(c);
} }
if(str == NULL || c != d) /* an error occured */ if(str == NULL || c != d)
{ {
free(str); free(str);
return -1; return -1;
} }
str[0] = d;
str[len++] = d; str[len++] = d;
str[len] = '\0'; str[len] = '\0';
token_set_string(token, str); token_set_string(token, str);