Handle corner case for abstract decls

sometimes abstract decls in parameter lists left the returned name uninitialized potentially leading to segfaults, like in int f(int ()) { return 0; } Deal with this.

Michael Matz committed 7 years ago

Commit 4b46e0e1 parent ef0397c3 files · +17 −1Browse files

Unified · Split

3 files

tccgen.c +3 −1
tests/tests2/60_errors_and_warnings.c +11 −0
tests/tests2/60_errors_and_warnings.expect +3 −0

tccgen.c+3−1

 	    parse_attribute(ad);
 	    post = type_decl(type, ad, v, td);
 	    skip(')');
-	}
+	} else
+	  goto abstract;
     } else if (tok >= TOK_IDENT && (td & TYPE_DIRECT)) {
 	/* type identifier */
 	*v = tok;
 	next();
     } else {
+  abstract:
 	if (!(td & TYPE_ABSTRACT))
 	  expect("identifier");
 	*v = 0;

tests/tests2/60_errors_and_warnings.c+11−0

@@ -130,4 +130,15 @@ static enum myenum { L = -1 } L; · 129 unmodified lines
130	void foo(void) {	130	void foo(void) {
131	static enum myenum { L = -1 } L;	131	static enum myenum { L = -1 } L;
132	}	132	}
		133	#elif defined test_abstract_decls
		134	int bar(const char *()); // abstract declarator here is okay
		135	int bar (const char (g)()) // should match this 'g' argument
		136	{
		137	g();
		138	return 42;
		139	}
		140	int foo(int ()) // abstract decl is wrong in definitions
		141	{
		142	return 0;
		143	}
133	#endif	144	#endif

tests/tests2/60_errors_and_warnings.expect+3−0

@@ -59,3 +59,6 @@ · 58 unmodified lines
59		59
60	[test_duplicate_def_2]	60	[test_duplicate_def_2]
61	60_errors_and_warnings.c:131: error: redeclaration of 'L'	61	60_errors_and_warnings.c:131: error: redeclaration of 'L'
		62
		63	[test_abstract_decls]
		64	60_errors_and_warnings.c:141: error: identifier expected

Handle corner case for abstract decls

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code