rpms/cups/FC-5 cups-string.patch,NONE,1.1 cups.spec,1.136,1.137

[fedora-cvs-commits at redhat.com]

Author: twaugh

Update of /cvs/dist/rpms/cups/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv11474

Modified Files:
	cups.spec 
Added Files:
	cups-string.patch 
Log Message:
* Sat Apr  1 2006 Tim Waugh <twaugh at redhat.com>
- Fixed _cupsStrFree() (STR #1529).


cups-string.patch:
 string.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE cups-string.patch ---
--- cups-1.2rc1/cups/string.c.string	2006-03-31 18:44:20.000000000 +0100
+++ cups-1.2rc1/cups/string.c	2006-03-31 18:45:13.000000000 +0100
@@ -269,7 +269,8 @@
 
   key.str = (char *)s;
 
-  if ((item = (_cups_sp_item_t *)cupsArrayFind(cg->stringpool, &key)) != NULL)
+  if ((item = (_cups_sp_item_t *)cupsArrayFind(cg->stringpool, &key)) != NULL
+      && item->str == s)
   {
    /*
     * Found it, dereference...


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- cups.spec	31 Mar 2006 15:39:27 -0000	1.136
+++ cups.spec	1 Apr 2006 08:25:58 -0000	1.137
@@ -35,6 +35,7 @@
 Patch12: cups-locale.patch
 Patch13: cups-CAN-2005-0064.patch
 Patch14: cups-str1521.patch
+Patch15: cups-string.patch
 Patch16: cups-pie.patch
 Patch17: cups-1.1.19-no_rpath.patch
 Patch18: cups-language.patch
@@ -128,6 +129,7 @@
 %patch12 -p1 -b .locale
 %patch13 -p1 -b .CAN-2005-0064
 %patch14 -p1 -b .str1521
+%patch15 -p1 -b .string
 %if %build_as_pie
 %patch16 -p1 -b .pie
 %endif
@@ -383,6 +385,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Sat Apr  1 2006 Tim Waugh <twaugh at redhat.com>
+- Fixed _cupsStrFree() (STR #1529).
+
 * Fri Mar 31 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.2.rc1.2.4
 - Fixed interaction with CUPS 1.1 servers (STR #1528).