Changeset 529

Timestamp:

Aug 5, 2003, 12:16:47 PM (22 years ago)

Author:

bird

Message:

A couple of memory related bugfixes.

Location:

trunk/src/emx/src/emxomf

Files:

• emxomfld.c (modified) (4 diffs, 1 prop)
• weakld.c (modified) (1 diff, 1 prop)

trunk/src/emx/src/emxomf/emxomfld.c ¶

@@ -200 +200 @@
 
   p = malloc (n);
-  if (p == NULL)
+  if (p == NULL && n)
     {
       fprintf (stderr, "emxomfld: out of memory\n");
@@ -218 +218 @@
 
   p = realloc (ptr, n);
-  if (p == NULL)
+  if (p == NULL && n)
     {
       fprintf (stderr, "emxomfld: out of memory\n");
@@ -235 +235 @@
 {
   char *p;
-
-  p = xmalloc (strlen (s) + 1);
-  strcpy (p, s);
+  int cch = strlen (s) + 1;
+
+  p = xmalloc (cch);
+  memcpy (p, s, cch);
   return p;
 }
@@ -825 +826 @@
       /* add argument to argument vector. */
       if (!(argi % 32))
-        argv = xrealloc(argv, argi + 32 + 1);
+        argv = xrealloc(argv, sizeof(argv[0]) * (argi + 32 + 1));
       argv[argi++] = xstrdup(psz);
 

trunk/src/emx/src/emxomf/weakld.c ¶

@@ -2161 +2161 @@
                     /* put into array of externals */
                     if (!(cExts % 64))
-                    {
-                        cExts += 64;
-                        papExts = xrealloc(papExts, sizeof(papExts[0]) * cExts);
-                    }
+                        papExts = xrealloc(papExts, sizeof(papExts[0]) * (cExts + 64));
                     papExts[cExts++] = pSym;
                 }