Fix crash on invalid code

like on 'enum myenum { L = -1 } L;'. It's a bit tedious as there are two paths (for global vs local symbols), and because the scope and enum_val share same storage.

Michael Matz committed 7 years ago

Commit ef0397c1 parent b0826593 files · +22 −2Browse files

Unified · Split

3 files

tccgen.c +10 −2
tests/tests2/60_errors_and_warnings.c +6 −0
tests/tests2/60_errors_and_warnings.expect +6 −0

tccgen.c+10−2

     return table_ident[v]->sym_identifier;
 }
+static int sym_scope(Sym *s)
+{
+  if (IS_ENUM_VAL (s->type.t))
+    return s->type.ref->sym_scope;
+  else
+    return s->sym_scope;
+}
 /* push a given symbol on the symbol stack */
 ST_FUNC Sym *sym_push(int v, CType *type, int r, int c)
 {
         s->prev_tok = *ps;
         *ps = s;
         s->sym_scope = local_scope;
-        if (s->prev_tok && s->prev_tok->sym_scope == s->sym_scope)
+        if (s->prev_tok && sym_scope(s->prev_tok) == s->sym_scope)
             tcc_error("redeclaration of '%s'",
                 get_tok_str(v & ~SYM_STRUCT, NULL));
     }
 /* Merge some type attributes.  */
 static void patch_type(Sym *sym, CType *type)
 {
-    if (!(type->t & VT_EXTERN)) {
+    if (!(type->t & VT_EXTERN) || IS_ENUM_VAL(sym->type.t)) {
         if (!(sym->type.t & VT_EXTERN))
             tcc_error("redefinition of '%s'", get_tok_str(sym->v, NULL));
         sym->type.t &= ~VT_EXTERN;

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

@@ -124,4 +124,10 @@ void f() { _Generic((int const *[]){0}, int:0); } · 123 unmodified lines
124	void f() { _Generic((int (()(float,char))(double,int)){0}, int:0); }	124	void f() { _Generic((int (()(float,char))(double,int)){0}, int:0); }
125	#elif defined test_array_to_str	125	#elif defined test_array_to_str
126	void f() { _Generic((int(*)[3]){0}, int:0); }	126	void f() { _Generic((int(*)[3]){0}, int:0); }
		127	#elif defined test_duplicate_def_1
		128	static enum myenum { L = -1 } L;
		129	#elif defined test_duplicate_def_2
		130	void foo(void) {
		131	static enum myenum { L = -1 } L;
		132	}
127	#endif	133	#endif

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

@@ -53,3 +53,9 @@ · 52 unmodified lines
53		53
54	[test_array_to_str]	54	[test_array_to_str]
55	60_errors_and_warnings.c:126: error: type 'int (*)[3]' does not match any association	55	60_errors_and_warnings.c:126: error: type 'int (*)[3]' does not match any association
		56
		57	[test_duplicate_def_1]
		58	60_errors_and_warnings.c:128: error: redefinition of 'L'
		59
		60	[test_duplicate_def_2]
		61	60_errors_and_warnings.c:131: error: redeclaration of 'L'

Fix crash on invalid code

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code