X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/96b00735351dd8e39fc5d71ff31afbdddd83ecba..a2c3dad92b2bf55488174c203563224880380c9b:/src/parse-decl.c

diff --git a/src/parse-decl.c b/src/parse-decl.c
index a31a377..8f0bd38 100644
--- a/src/parse-decl.c
+++ b/src/parse-decl.c
@@ -73,9 +73,10 @@ struct parse_item *cdecl__alloc_item(size_t s_sz)
  */
 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)
@@ -117,7 +118,7 @@ static int valid_typespec(struct cdecl_declspec *s)
  */
 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;
@@ -125,7 +126,7 @@ static bool valid_declspecs(struct cdecl *decl, bool top)
 	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 &&
@@ -500,9 +501,9 @@ static int forall_declarators(struct cdecl *decl,
 
 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;
@@ -514,8 +515,15 @@ static struct cdecl *do_parse(const char *str, int english_mode)
 		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);