From: mike <mike@7a7537e8-13f0-0310-91df-b6672ffda945>
Date: Thu, 10 Jan 2013 17:40:38 +0000 (+0000)
Subject: Make sure we initialize define_match/no_match to NULL, and make sure we free
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4574f9bc0b1747d38a82e633ac74aa6e87cfeccb;p=thirdparty%2Fcups.git

Make sure we initialize define_match/no_match to NULL, and make sure we free
them on error.


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

diff --git a/doc/help/man-ipptool.html b/doc/help/man-ipptool.html
index 1b523c537d..189613a9d4 100644
--- a/doc/help/man-ipptool.html
+++ b/doc/help/man-ipptool.html
@@ -151,7 +151,7 @@ The following standard files are available:
 <br>
 <a href='http://localhost:631/help'>http://localhost:631/help</a>
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
-Copyright 2007-2012 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 
 </body>
 </html>
diff --git a/test/ipptool.c b/test/ipptool.c
index 07c0b04351..cddc55dfb9 100644
--- a/test/ipptool.c
+++ b/test/ipptool.c
@@ -1858,6 +1858,8 @@ do_tests(_cups_vars_t *vars,		/* I - Variables */
         last_status = statuses + num_statuses;
 	num_statuses ++;
 
+        last_status->define_match    = NULL;
+        last_status->define_no_match = NULL;
 	last_status->if_defined      = NULL;
 	last_status->if_not_defined  = NULL;
 	last_status->repeat_limit    = 1000;
@@ -3137,6 +3139,10 @@ do_tests(_cups_vars_t *vars,		/* I - Variables */
       free(statuses[i].if_defined);
     if (statuses[i].if_not_defined)
       free(statuses[i].if_not_defined);
+      if (statuses[i].define_match)
+        free(statuses[i].define_match);
+      if (statuses[i].define_no_match)
+        free(statuses[i].define_no_match);
   }
 
   for (i = num_expects, expect = expects; i > 0; i --, expect ++)