Prevent problems with section alignment by not shrinking the .rsrc section.

[deliverable/binutils-gdb.git] / libiberty / cp-demint.c

diff --git a/libiberty/cp-demint.c b/libiberty/cp-demint.c
index 2e8f8d2d0579d8032be40e511d3c05fa4bf8f2c0..efcc5b7f5c02a3ae1cda503a80fe1f85609e85bd 100644 (file)
--- a/libiberty/cp-demint.c
+++ b/libiberty/cp-demint.c
@@ -110,6 +110,7 @@ cplus_demangle_fill_component (struct demangle_component *p,
     case DEMANGLE_COMPONENT_IMAGINARY:
     case DEMANGLE_COMPONENT_VENDOR_TYPE:
     case DEMANGLE_COMPONENT_CAST:
+    case DEMANGLE_COMPONENT_CONVERSION:
       if (right != NULL)
        return 0;
       break;
@@ -206,10 +207,8 @@ cplus_demangle_v3_components (const char *mangled, int options, void **mem)
             malloc (di.num_subs * sizeof (struct demangle_component *)));
   if (di.comps == NULL || di.subs == NULL)
     {
-      if (di.comps != NULL)
-       free (di.comps);
-      if (di.subs != NULL)
-       free (di.subs);
+      free (di.comps);
+      free (di.subs);
       return NULL;
     }