- Fixed small memory leak in the WINGs' font panel code.

- Fixed call to qsort in WMSortArray. - Fixed a memleak in the WINGs' file panel.
2026-01-05 21:34:17 +01:00 · 2003-04-02 11:37:04 +00:00
parent 5f79f1bcde
commit f058fdf72c
36 changed files with 54 additions and 78 deletions
--- a/.cvsignore
+++ b/.cvsignore
@@ -3,7 +3,6 @@ aclocal.m4
 configure config.log config.cache config.guess config.status config.sub
 libtool ltconfig ltmain.sh
 autom4te.cache
-.psrc .inslog2 tca.map tca.log
-*.rpt
+.psrc .inslog2 tca.map tca.log pchdir *.rpt
 update
 WindowMaker*.tar.gz
--- a/2
+++ b/2
@@ -68,6 +68,8 @@ Changes since version 0.80.2:
 - Fixed bug with scrolling menus introduced by the xinerama patch.
 - Fixed bug that could cause SIGSEGV by accessing beyond the end of text in
  a WINGs textfield widget.
+- Fixed small memory leak in WINGs' font panel code.
+- Fixed memory leak in WINGs' file panel code.


 Changes since version 0.80.1:
--- a/WINGs/.cvsignore
+++ b/WINGs/.cvsignore
@@ -1,5 +1,4 @@
 Makefile Makefile.in
 get-wings-flags get-wutil-flags
 .libs
-.psrc .inslog2 tca.map tca.log
-*.rpt
+.psrc .inslog2 tca.map tca.log pchdir *.rpt
--- a/WINGs/ChangeLog
+++ b/WINGs/ChangeLog
@@ -55,6 +55,9 @@ Changes since wmaker 0.80.1:
 - Added WMSetTableViewHasHorizontalScroller()
 - Fixed bug that could cause SIGSEGV by accessing beyond the end of text in
  a WINGs textfield widget.
+- Fixed small memory leak in the font panel code.
+- Fixed call to qsort in WMSortArray.
+- Fixed a memleak in the file panel.


 Changes since wmaker 0.80.0:
--- a/WINGs/Documentation/.cvsignore
+++ b/WINGs/Documentation/.cvsignore
@@ -1,3 +1,2 @@
 Makefile Makefile.in
-.psrc .inslog2 tca.map tca.log
-*.rpt
+.psrc .inslog2 tca.map tca.log pchdir *.rpt
--- a/WINGs/Examples/.cvsignore
+++ b/WINGs/Examples/.cvsignore
@@ -1,5 +1,4 @@
 Makefile Makefile.in
 connect server fontl puzzle UserTime.plist
 .libs
-.psrc .inslog2 tca.map tca.log
-*.rpt
+.psrc .inslog2 tca.map tca.log pchdir *.rpt
--- a/WINGs/Extras/.cvsignore
+++ b/WINGs/Extras/.cvsignore
@@ -1,5 +1,4 @@
 Makefile Makefile.in
 .libs
 test
-.psrc .inslog2 tca.map tca.log
-*.rpt
+.psrc .inslog2 tca.map tca.log pchdir *.rpt
--- a/WINGs/Resources/.cvsignore
+++ b/WINGs/Resources/.cvsignore
@@ -1,3 +1,2 @@
 Makefile Makefile.in
-.psrc .inslog2 tca.map tca.log
-*.rpt
+.psrc .inslog2 tca.map tca.log pchdir *.rpt
--- a/WINGs/Tests/.cvsignore
+++ b/WINGs/Tests/.cvsignore
@@ -1,5 +1,4 @@
 Makefile Makefile.in
 testtext testcolorpanel testmywidget wmfile wmquery wtest
 .libs
-.psrc .inslog2 tca.map tca.log
-*.rpt
+.psrc .inslog2 tca.map tca.log pchdir *.rpt
--- a/WINGs/array.c
+++ b/WINGs/array.c
@@ -274,7 +274,9 @@ WMCountInArray(WMArray *array, void *item)
 void
 WMSortArray(WMArray *array, WMCompareDataProc *comparer)
 {
-    qsort(array->items, array->itemCount, sizeof(void*), comparer);
+    if (array->itemCount > 1) { /* Don't sort empty or single element arrays */
+        qsort(array->items, array->itemCount, sizeof(void*), comparer);
+    }
 }


--- a/WINGs/po/.cvsignore
+++ b/WINGs/po/.cvsignore
@@ -1,5 +1,4 @@
 Makefile Makefile.in
-.psrc .inslog2 tca.map tca.log
-*.rpt
+.psrc .inslog2 tca.map tca.log pchdir *.rpt
 *.pot
 *.mo
--- a/WINGs/wfilepanel.c
+++ b/WINGs/wfilepanel.c
@@ -548,12 +548,15 @@ listDirectoryOnColumn(WMFilePanel *panel, int column, char *path)
    DIR *dir;
    struct stat stat_buf;
    char pbuf[PATH_MAX+16];
+    char *name;

    assert(column >= 0);
    assert(path != NULL);

    /* put directory name in the title */
-    WMSetBrowserColumnTitle(bPtr, column, get_name_from_path(path));
+    name = get_name_from_path(path);
+    WMSetBrowserColumnTitle(bPtr, column, name);
+    wfree(name);
    
    dir = opendir(path);
    
--- a/WINGs/wfontpanel.c
+++ b/WINGs/wfontpanel.c
@@ -831,15 +831,17 @@ getSelectedFont(FontPanel *panel, char buffer[], int bufsize)
    size = WMGetTextFieldText(panel->sizT);

    snprintf(buffer, bufsize, "-%s-%s-%s-%s-%s-%s-%s-*-*-*-*-*-%s-%s",
-	    family->foundry,
-	    family->name,
-	    face->weight,
-	    face->slant,
-	    face->setWidth,
-	    face->addStyle,
-	    size,
-	    family->registry,
-	    family->encoding);
+             family->foundry,
+             family->name,
+             face->weight,
+             face->slant,
+             face->setWidth,
+             face->addStyle,
+             size,
+             family->registry,
+             family->encoding);
+
+    wfree(size);
 }


--- a/WPrefs.app/.cvsignore
+++ b/WPrefs.app/.cvsignore
@@ -1,5 +1,4 @@
 Makefile Makefile.in
 WPrefs
 .libs
-.psrc .inslog2 tca.map tca.log
-*.rpt
+.psrc .inslog2 tca.map tca.log pchdir *.rpt
--- a/WPrefs.app/po/.cvsignore
+++ b/WPrefs.app/po/.cvsignore
@@ -1,5 +1,4 @@
 Makefile Makefile.in
-.psrc .inslog2 tca.map tca.log
-*.rpt
+.psrc .inslog2 tca.map tca.log pchdir *.rpt
 *.pot
 *.mo
--- a/WPrefs.app/tiff/.cvsignore
+++ b/WPrefs.app/tiff/.cvsignore
@@ -1,3 +1,2 @@
 Makefile Makefile.in
-.psrc .inslog2 tca.map tca.log
-*.rpt
+.psrc .inslog2 tca.map tca.log pchdir *.rpt
--- a/WPrefs.app/xpm/.cvsignore
+++ b/WPrefs.app/xpm/.cvsignore
@@ -1,3 +1,2 @@
 Makefile Makefile.in
-.psrc .inslog2 tca.map tca.log
-*.rpt
+.psrc .inslog2 tca.map tca.log pchdir *.rpt
--- a/WindowMaker/.cvsignore
+++ b/WindowMaker/.cvsignore
@@ -1,3 +1,2 @@
 Makefile Makefile.in
-.psrc .inslog2 tca.map tca.log
-*.rpt
+.psrc .inslog2 tca.map tca.log pchdir *.rpt
--- a/WindowMaker/Backgrounds/.cvsignore
+++ b/WindowMaker/Backgrounds/.cvsignore
@@ -1,3 +1,2 @@
 Makefile Makefile.in
-.psrc .inslog2 tca.map tca.log
-*.rpt
+.psrc .inslog2 tca.map tca.log pchdir *.rpt
--- a/WindowMaker/Defaults/.cvsignore
+++ b/WindowMaker/Defaults/.cvsignore
@@ -1,4 +1,3 @@
 Makefile Makefile.in
 WMState WMWindowAttributes WindowMaker WMRootMenu
-.psrc .inslog2 tca.map tca.log
-*.rpt
+.psrc .inslog2 tca.map tca.log pchdir *.rpt
--- a/WindowMaker/IconSets/.cvsignore
+++ b/WindowMaker/IconSets/.cvsignore
@@ -1,4 +1,3 @@
 Makefile Makefile.in
 Default.iconset
-.psrc .inslog2 tca.map tca.log
-*.rpt
+.psrc .inslog2 tca.map tca.log pchdir *.rpt
--- a/WindowMaker/Icons/.cvsignore
+++ b/WindowMaker/Icons/.cvsignore
@@ -1,3 +1,2 @@
 Makefile Makefile.in
-.psrc .inslog2 tca.map tca.log
-*.rpt
+.psrc .inslog2 tca.map tca.log pchdir *.rpt
--- a/WindowMaker/Pixmaps/.cvsignore
+++ b/WindowMaker/Pixmaps/.cvsignore
@@ -1,3 +1,2 @@
 Makefile Makefile.in
-.psrc .inslog2 tca.map tca.log
-*.rpt
+.psrc .inslog2 tca.map tca.log pchdir *.rpt
--- a/WindowMaker/Styles/.cvsignore
+++ b/WindowMaker/Styles/.cvsignore
@@ -1,3 +1,2 @@
 Makefile Makefile.in
-.psrc .inslog2 tca.map tca.log
-*.rpt
+.psrc .inslog2 tca.map tca.log pchdir *.rpt
--- a/WindowMaker/Themes/.cvsignore
+++ b/WindowMaker/Themes/.cvsignore
@@ -1,3 +1,2 @@
 Makefile Makefile.in
-.psrc .inslog2 tca.map tca.log
-*.rpt
+.psrc .inslog2 tca.map tca.log pchdir *.rpt
--- a/contrib/.cvsignore
+++ b/contrib/.cvsignore
@@ -1,4 +1,3 @@
 Makefile Makefile.in
 WindowMaker.spec
-.psrc .inslog2 tca.map tca.log
-*.rpt
+.psrc .inslog2 tca.map tca.log pchdir *.rpt
--- a/doc/.cvsignore
+++ b/doc/.cvsignore
@@ -1,3 +1,2 @@
 Makefile Makefile.in
-.psrc .inslog2 tca.map tca.log
-*.rpt
+.psrc .inslog2 tca.map tca.log pchdir *.rpt
--- a/doc/sk/.cvsignore
+++ b/doc/sk/.cvsignore
@@ -1,3 +1,2 @@
 Makefile Makefile.in
-.psrc .inslog2 tca.map tca.log
-*.rpt
+.psrc .inslog2 tca.map tca.log pchdir *.rpt
--- a/plugins/.cvsignore
+++ b/plugins/.cvsignore
@@ -1,8 +1,2 @@
-Makefile Makefile.in
-aclocal.m4
-configure config.log config.cache config.guess config.status config.sub
-libtool ltconfig ltmain.sh
-.psrc .inslog2 tca.map tca.log
-*.rpt
-update update-autoconf
+.psrc .inslog2 tca.map tca.log pchdir *.rpt
 libwmfun*.tar.gz
--- a/plugins/libwmfun/.cvsignore
+++ b/plugins/libwmfun/.cvsignore
@@ -2,5 +2,4 @@ Makefile Makefile.in
 *.lo *.la
 stamp-h stamp-h.in config.h config.h.in
 .libs
-.psrc .inslog2 tca.map tca.log
-*.rpt
+.psrc .inslog2 tca.map tca.log pchdir *.rpt
--- a/po/.cvsignore
+++ b/po/.cvsignore
@@ -1,5 +1,4 @@
 Makefile Makefile.in
-.psrc .inslog2 tca.map tca.log
-*.rpt
+.psrc .inslog2 tca.map tca.log pchdir *.rpt
 *.pot
 *.mo
--- a/src/.cvsignore
+++ b/src/.cvsignore
@@ -2,5 +2,4 @@ Makefile Makefile.in
 config.h config.h.in wconfig.h stamp-h stamp-h1 stamp-h.in
 .libs
 wmaker
-.psrc .inslog2 tca.map tca.log
-*.rpt
+.psrc .inslog2 tca.map tca.log pchdir *.rpt
--- a/test/.cvsignore
+++ b/test/.cvsignore
@@ -1,5 +1,4 @@
 Makefile Makefile.in
 wtest
 .libs
-.psrc .inslog2 tca.map tca.log
-*.rpt
+.psrc .inslog2 tca.map tca.log pchdir *.rpt
--- a/util/.cvsignore
+++ b/util/.cvsignore
@@ -2,5 +2,4 @@ Makefile Makefile.in
 wmsetup wmagnify wxcopy wxpaste wdwrite getstyle setstyle seticons geticonset
 wmsetbg wmaker.inst wdread wmchlocale
 .libs
-.psrc .inslog2 tca.map tca.log
-*.rpt
+.psrc .inslog2 tca.map tca.log pchdir *.rpt
--- a/wmlib/.cvsignore
+++ b/wmlib/.cvsignore
@@ -1,3 +1,2 @@
 Makefile Makefile.in
-.psrc .inslog2 tca.map tca.log
-*.rpt
+.psrc .inslog2 tca.map tca.log pchdir *.rpt
--- a/wrlib/.cvsignore
+++ b/wrlib/.cvsignore
@@ -2,5 +2,4 @@ Makefile Makefile.in
 *.lo *.la
 view testgrad testdraw testrot get-wraster-flags
 .libs
-.psrc .inslog2 tca.map tca.log
-*.rpt
+.psrc .inslog2 tca.map tca.log pchdir *.rpt