Mirror fix from trunk.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/branches/branch-1.7@11756 a1ca3aef-8c08-0410-bb20-df032aa958be

diff --git a/CHANGES.txt b/CHANGES.txt
index 3f35ada177d62cac2de37fcc116807e6305c8567..b86b5b7bc80fff648af2329a76592e9a540aa90a 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,4 @@
-CHANGES.txt - 1.7.2 - 2014-03-26
+CHANGES.txt - 1.7.2 - 2014-03-27
 --------------------------------
 
 CHANGES IN CUPS V1.7.2
@@ -12,6 +12,7 @@ CHANGES IN CUPS V1.7.2
          operations (STR #4389)
        - Phone numbers in fax jobs were not properly filtered for IPP FaxOut
          (<rdar://problem/16351701>)
+       - Fixed a memory leak in the label printer driver (STR #4393)
        - Updated Linux "relro" support (STR #4349)
        - cupsEnumDests did not set the "is_default" field (STR #4332)
        - cupsDoIORequest could miss the server status, causing failed lpadmin

diff --git a/filter/rastertolabel.c b/filter/rastertolabel.c
index bd1965c6a407193e748a578d639f40647f163b32..f35b9cbe303320507e3c8304a5fd91ec71c3d9fc 100644 (file)
--- a/filter/rastertolabel.c
+++ b/filter/rastertolabel.c
@@ -639,13 +639,6 @@ EndPage(ppd_file_t *ppd,           /* I - PPD file */
 
         puts("^IDR:CUPS.GRF^FS");
        puts("^XZ");
-
-       /*
-        * Free compression buffers...
-       */
-
-       free(CompBuffer);
-       free(LastBuffer);
         break;
 
     case ZEBRA_CPCL :
@@ -714,6 +707,18 @@ EndPage(ppd_file_t *ppd,           /* I - PPD file */
   */
 
   free(Buffer);
+
+  if (CompBuffer)
+  {
+    free(CompBuffer);
+    CompBuffer = NULL;
+  }
+
+  if (LastBuffer)
+  {
+    free(LastBuffer);
+    LastBuffer = NULL;
+  }
 }