[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gcl-devel] [PATCH 4/6] Check for preceding NULL in find_init_name1
From: |
Will Newton |
Subject: |
[Gcl-devel] [PATCH 4/6] Check for preceding NULL in find_init_name1 |
Date: |
Thu, 17 Jul 2014 13:44:54 +0100 |
From: Will Newton <address@hidden>
The current approach will find a function name like
"fSinit_function" and return "init_function" which is not what
we want. Check that the found function name is preceded by a NULL
to avoid this.
---
gcl/o/cmpaux.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gcl/o/cmpaux.c b/gcl/o/cmpaux.c
index 353a9fb..60955b7 100755
--- a/gcl/o/cmpaux.c
+++ b/gcl/o/cmpaux.c
@@ -556,7 +556,7 @@ find_init_name1(char *s,unsigned len) {
if (fread(tmp,1,ss.st_size,f)!=ss.st_size)
FEerror("Error reading binary file",0);
fclose(f);
- for (s=tmp;s<tmp+ss.st_size &&
strncmp(s,"init_",5);q=strstr(s+1,"init_"),s=q ? q : s+strlen(s)+1);
+ for (s=tmp+1;s<tmp+ss.st_size && (strncmp(s,"init_",5) || s[-1] !=
'\0');q=strstr(s+1,"init_"),s=q ? q : s+strlen(s)+1);
if (strncmp(s,"init_",5))
FEerror("Init name not found",0);
return make_simple_string(s);
--
1.9.3
- [Gcl-devel] [PATCH 0/6] ARM and AArch64 patches for 2.6.11, Will Newton, 2014/07/17
- [Gcl-devel] [PATCH 2/6] o/main.c: Ensure cs_org is always pointer aligned, Will Newton, 2014/07/17
- [Gcl-devel] [PATCH 1/6] config.{sub, guess}: Update to latest versions of GNU config, Will Newton, 2014/07/17
- [Gcl-devel] [PATCH 4/6] Check for preceding NULL in find_init_name1,
Will Newton <=
- [Gcl-devel] [PATCH 3/6] Add support for AArch64, Will Newton, 2014/07/17
- [Gcl-devel] [PATCH 5/6] Simplify print_insn logic in configure, Will Newton, 2014/07/17
- [Gcl-devel] [PATCH 6/6] Ensure that libgcc is linked dynamically on ARM, Will Newton, 2014/07/17