Hallo.
|The attached diff fixes the issue for me.
One more.
|Ciao!
--steffen
diff --git a/tccgen.c b/tccgen.c
index fdd8654..00a26c5 100644
--- a/tccgen.c
+++ b/tccgen.c
@@ -6523,11 +6523,13 @@ static void gen_inline_functions(TCCState *s)
sym->r = VT_SYM | VT_CONST;
sym->type.t &= ~VT_INLINE;
+ s->inline_fns[i] = NULL;
begin_macro(&fn->func_str, 0);
next();
cur_text_section = text_section;
gen_function(sym);
end_macro();
+ s->inline_fns[i] = fn;
inline_generated = 1;
}
@@ -6544,7 +6546,7 @@ ST_FUNC void free_inline_functions(TCCState *s)
/* free tokens of unused inline functions */
for (i = 0; i < s->nb_inline_fns; ++i) {
struct InlineFunc *fn = s->inline_fns[i];
- if (fn->sym)
+ if (fn != NULL && fn->sym != NULL)
tok_str_free(fn->func_str.str);
}
dynarray_reset(&s->inline_fns, &s->nb_inline_fns);
@@ -6695,14 +6697,15 @@ static int decl0(int l, int is_for_loop_init)
(VT_INLINE | VT_STATIC)) {
int block_level;
struct InlineFunc *fn;
+ size_t fnl;
const char *filename;
-
- filename = file ? file->filename : "";
- fn = tcc_malloc(sizeof *fn + strlen(filename));
- strcpy(fn->filename, filename);
+
+ fnl = strlen(filename = file ? file->filename : "") +1;
+ fn = tcc_malloc(sizeof *fn + fnl);
+ memcpy(fn->filename, filename, fnl);
fn->sym = sym;
tok_str_new(&fn->func_str);
-
+
block_level = 0;
for(;;) {
int t;
@@ -6721,8 +6724,8 @@ static int decl0(int l, int is_for_loop_init)
}
tok_str_add(&fn->func_str, -1);
tok_str_add(&fn->func_str, 0);
- dynarray_add((void ***)&tcc_state->inline_fns, &tcc_state->nb_inline_fns, fn);
-
+ dynarray_add((void ***)&tcc_state->inline_fns,
+ &tcc_state->nb_inline_fns, fn);
} else {
/* compute text section */
cur_text_section = ad.section;
diff --git a/tccpp.c b/tccpp.c
index b75603f..270c220 100644
--- a/tccpp.c
+++ b/tccpp.c
@@ -1549,8 +1549,13 @@ static CachedInclude *search_cached_include(TCCState *s1, const char *filename,
if (!add)
return NULL;
- e = tcc_malloc(sizeof(CachedInclude) + strlen(filename));
- strcpy(e->filename, filename);
+ /* C99 */{
+ size_t j;
+
+ j = strlen(filename) +1;
+ e = tcc_malloc(sizeof(CachedInclude) + j);
+ memcpy(e->filename, filename, j);
+ }
e->ifndef_macro = e->once = 0;
dynarray_add((void ***)&s1->cached_includes, &s1->nb_cached_includes, e);
/* add in hash table */
_______________________________________________
Tinycc-devel mailing list
[email protected]
https://lists.nongnu.org/mailman/listinfo/tinycc-devel
