Changeset 718

Timestamp:

Sep 24, 2003, 1:42:38 AM (22 years ago)

Author:

bird

Message:

Return something in any case.

File:

• trunk/src/emx/src/innidmdll/innidmdll.c (modified) (2 diffs, 1 prop)

trunk/src/emx/src/innidmdll/innidmdll.c

@@ -76 +76 @@
     char *  pszMang;
     char *  pszMangFree;
+    char *  psz;
+    int     cch;
 
     /*
@@ -102 +104 @@
     /*
      * Call the demangler.
+     * On failure return mangled name.
      */
-    pszProto = cplus_demangle(pszMang, DMGL_PARAMS | DMGL_ANSI);
-    if (pszProto)
+    psz = pszProto = cplus_demangle(pszMang, DMGL_PARAMS | DMGL_ANSI);
+    if (!psz)
+        psz = pszMangFree;
+
+    /*
+     * Copy to result buffer.
+     */
+    cch = strlen(psz);
+    if (cch >= cchPrototype)
     {
-        int cchProto = strlen(pszProto);
-        if (cchProto >= cchPrototype)
-        {
-            memcpy(pszPrototype, pszProto, cchPrototype - 1);
-            pszPrototype[cchPrototype - 1] = '\0';
-        }
-        else
-        {
-            memcpy(pszPrototype, pszProto, cchProto + 1);
-            if (pszWeak && cchProto + 6 < cchPrototype)
-                strcpy(pszPrototype + cchProto, " weak");
-        }
-        free(pszProto);
+        memcpy(pszPrototype, psz, cchPrototype - 1);
+        pszPrototype[cchPrototype - 1] = '\0';
+    }
+    else
+    {
+        memcpy(pszPrototype, psz, cch + 1);
+        if (pszWeak && cch + 6 < cchPrototype)
+            strcpy(pszPrototype + cch, " weak");
     }
 
     /*
-     * Free pszMang
+     * Cleanup.
      */
+    free(pszProto);
     free(pszMangFree);
 
-    return pszProto != NULL;
+    return 1; /* we never fail */
 }