Changeset 3704

Timestamp:

Mar 16, 2011, 6:52:54 PM (14 years ago)

Author:

bird

Message:

0.6: Backported r3703: moddef.h,emxbind,weakld: Expanded the symbol name fields in libmoddef so that we can parse def-files with long symbols before truncating them (weakld). Fixes #37.

Location:

branches/libc-0.6/src/emx

Files:

• include/sys/moddef.h (modified) (3 diffs)
• src/emxbind/export.c (modified) (1 diff)

branches/libc-0.6/src/emx/include/sys/moddef.h

@@ -97 +97 @@
 } _md_error;
 
+/** The maximum symbol name size (terminator included). */ 
+#define _MD_MAX_SYMBOL_SIZE     1536
+
 typedef struct
 {
@@ -127 +130 @@
     struct
       {
-        char entryname[256];
-        char internalname[256];
+        char entryname[_MD_MAX_SYMBOL_SIZE];
+        char internalname[_MD_MAX_SYMBOL_SIZE];
         int ordinal;
         int pwords;
@@ -135 +138 @@
     struct
       {
-        char entryname[256];
-        char internalname[256];
+        char entryname[_MD_MAX_SYMBOL_SIZE];
+        char internalname[_MD_MAX_SYMBOL_SIZE];
         char modulename[256];
         int ordinal;

branches/libc-0.6/src/emx/src/emxbind/export.c

@@ -55 +55 @@
         error ("ordinal %u multiply defined", (unsigned)exp->ord);
     }
+  
+  if (   !(exp->flags & _MDEP_NONAME)
+      && strlen (exp->entryname) > 255)
+      error ("exported name is too long (%d chars): %s", 
+             strlen (exp->entryname), exp->entryname);
+  
   if (export_len >= export_size)
     {