This patch fixes some of the FontList related leaks.
There are also some cleanups for compiler warnings about
unreachable code.

- Steve

*** lib/Xm/ResConvert.c.orig    Wed May 24 07:49:09 2000
--- lib/Xm/ResConvert.c Thu Aug  3 18:33:33 2000
***************
*** 1317,1322 ****
--- 1317,1323 ----
                                                           XmFONT_IS_FONT,
                                                       XmFONTLIST_DEFAULT_TAG);
            textFontList = XmFontListAppendEntry(NULL, newEntry);
+           XmFontListEntryFree(&newEntry);
        }

        if (textFontList == NULL) {
***************
*** 1324,1330 ****
        }

        return XmFontListCopy(textFontList);
-       break;

      case XmBUTTON_FONTLIST:
        while ((par = XtParent(par)) != NULL)
--- 1325,1330 ----
***************
*** 1359,1364 ****
--- 1359,1365 ----
                                                           XmFONT_IS_FONT,
                                                       XmFONTLIST_DEFAULT_TAG);
            buttonFontList = XmFontListAppendEntry(NULL, newEntry);
+           XmFontListEntryFree(&newEntry);
        }

        if (buttonFontList == NULL) {
***************
*** 1366,1372 ****
        }

        return XmFontListCopy(buttonFontList);
-       break;

      default:
      case XmLABEL_FONTLIST:
--- 1367,1372 ----
***************
*** 1405,1410 ****
--- 1405,1411 ----
                                                           XmFONT_IS_FONT,
                                                       XmFONTLIST_DEFAULT_TAG);
            labelFontList = XmFontListAppendEntry(NULL, newEntry);
+           XmFontListEntryFree(&newEntry);
        }

        if (labelFontList == NULL) {
***************
*** 1412,1419 ****
        }

        return XmFontListCopy(labelFontList);
-
-       break;
      }
  }

--- 1413,1418 ----



--== Sent via Deja.com http://www.deja.com/ ==--
Before you buy.

Reply via email to