gcl-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Gcl-devel] [PATCH 06/11] Check for preceding NULL in find_init_name1


From: Will Newton
Subject: [Gcl-devel] [PATCH 06/11] Check for preceding NULL in find_init_name1
Date: Wed, 11 Jun 2014 17:27:19 +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 bbeaf35..6c41ab7 100644
--- a/gcl/o/cmpaux.c
+++ b/gcl/o/cmpaux.c
@@ -701,7 +701,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




reply via email to

[Prev in Thread] Current Thread [Next in Thread]