Force allocation and free of nickname.

cups/ppd.c:
    - ppdClose(): Always free ppd->nickname.
    - ppdOpen2(): Always strdup() ppd->nickname.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@5302 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/CHANGES.txt b/CHANGES.txt
index 6169494dbda91a024178ed564597a70b88e19fe9..d0f72492767afc3c9a4f343fae5d64dc1ac7be57 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,6 +3,7 @@ CHANGES.txt - 2006-03-17
 
 CHANGES IN CUPS V1.2rc1
 
+       - Fixed a minor memory leak in the PPD API.
        - Fixed transcoding issues (STR #1493)
        - The scheduler now enforces a minimum job cost of 100
          when doing FilterLimit checks.

diff --git a/cups/ppd.c b/cups/ppd.c
index 7000da4f965ff4dbeca4f108482e859196b35f0d..2d1efab17d23de5fad3e29d27fa588d147ec4df4 100644 (file)
--- a/cups/ppd.c
+++ b/cups/ppd.c
@@ -150,10 +150,8 @@ ppdClose(ppd_file_t *ppd)          /* I - PPD file record */
   * Free all strings at the top level...
   */
 
-  if (!ppd->lang_encoding || strcasecmp(ppd->lang_encoding, "UTF-8"))
-    ppd_free(ppd->nickname);
-
   ppd_free(ppd->lang_encoding);
+  ppd_free(ppd->nickname);
   ppd_free(ppd->patches);
   ppd_free(ppd->jcl_begin);
   ppd_free(ppd->jcl_end);
@@ -746,7 +744,7 @@ ppdOpen2(cups_file_t *fp)           /* I - File to read from */
        ppd->nickname = strdup((char *)utf8);
       }
       else
-        ppd->nickname = string;
+        ppd->nickname = strdup(string);
     }
     else if (!strcmp(keyword, "Product"))
       ppd->product = string;