*/
static int valid_typespec(struct cdecl_declspec *s)
{
+ struct cdecl_declspec *c;
unsigned long map = 0;
- for (struct cdecl_declspec *c = s; c; c = c->next) {
+ for (c = s; c; c = c->next) {
unsigned long bit;
if (cdecl_spec_kind(c) != CDECL_SPEC_TYPE)
*/
static bool valid_declspecs(struct cdecl *decl, bool top)
{
- struct cdecl_declspec *specs = decl->specifiers;
+ struct cdecl_declspec *c, *specs = decl->specifiers;
struct cdecl_declarator *d = decl->declarators;
bool abstract = cdecl_is_abstract(d);
unsigned num_storage = 0;
if (!valid_typespec(specs))
return false;
- for (struct cdecl_declspec *c = specs; c; c = c->next) {
+ for (c = specs; c; c = c->next) {
switch (cdecl_spec_kind(c)) {
case CDECL_SPEC_TYPE:
if (c->type == CDECL_TYPE_VOID &&
spec->u.declarator.type = CDECL_DECL_IDENT;
*p = &spec->u.declarator;
- free(d);
d = param->declarators;
free(param);
return d;
if (!new)
return 0; /* e.g. int (foo bar) */
*p = new;
- free(d->child);
free(d);
return 1;
static struct cdecl *do_parse(const char *str, int english_mode)
{
+ struct cdecl *decl = NULL;
YY_BUFFER_STATE state;
yyscan_t scanner;
- struct cdecl *decl;
#if YYDEBUG
extern int cdecl__yydebug;
return NULL;
state = cdecl__yy_scan_string(str, scanner);
- if (cdecl__yyparse(scanner, &decl) != 0)
+ if (cdecl__yyparse(scanner, &decl) != 0) {
+ /*
+ * If the input consists of a complete, valid declaration
+ * followed by some garbage, that parsed declaration will
+ * be output by the parser and we need to free it here.
+ */
+ cdecl__free(decl);
decl = NULL;
+ }
cdecl__yy_delete_buffer(state, scanner);
cdecl__yylex_destroy(scanner);