rpms/cups/F-11 cups-str3448.patch,NONE,1.1 cups.spec,1.555,1.556

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26538

Modified Files:
	cups.spec 
Added Files:
	cups-str3448.patch 
Log Message:
* Thu Dec 10 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-16
- Fixed invalid read in cupsAddDest (bug #547460).


cups-str3448.patch:
 dest.c |    6 ++++++
 1 file changed, 6 insertions(+)

--- NEW FILE cups-str3448.patch ---
diff -up cups-1.4.2/cups/dest.c.str3448 cups-1.4.2/cups/dest.c
--- cups-1.4.2/cups/dest.c.str3448	2009-08-28 23:54:34.000000000 +0100
+++ cups-1.4.2/cups/dest.c	2009-12-10 18:15:50.910079549 +0000
@@ -145,6 +145,12 @@ cupsAddDest(const char  *name,		/* I  - 
 
     dest = cups_add_dest(name, instance, &num_dests, dests);
 
+   /*
+    * Find the base dest again now the array has been realloc'd.
+    */
+
+    parent = cupsGetDest(name, NULL, num_dests, *dests);
+
     if (instance && parent && parent->num_options > 0)
     {
      /*


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.555
retrieving revision 1.556
diff -u -p -r1.555 -r1.556
--- cups.spec	9 Dec 2009 11:32:18 -0000	1.555
+++ cups.spec	10 Dec 2009 18:17:41 -0000	1.556
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.2
-Release: 15%{?dist}
+Release: 16%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -28,6 +28,7 @@ Source15: textonly.ppd
 Patch1: cups-no-gzip-man.patch
 Patch2: cups-1.1.16-system-auth.patch
 Patch3: cups-multilib.patch
+Patch4: cups-str3448.patch
 Patch5: cups-serial.patch
 Patch6: cups-banners.patch
 Patch7: cups-serverbin-compat.patch
@@ -206,6 +207,7 @@ module. 
 %patch1 -p1 -b .no-gzip-man
 %patch2 -p1 -b .system-auth
 %patch3 -p1 -b .multilib
+%patch4 -p1 -b .str3448
 %patch5 -p1 -b .serial
 %patch6 -p1 -b .banners
 %patch7 -p1 -b .serverbin-compat
@@ -543,6 +545,9 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Thu Dec 10 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-16
+- Fixed invalid read in cupsAddDest (bug #547460).
+
 * Wed Dec  9 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-15
 - Use upstream patch to fix scheduler crash when an active printer was
   deleted (rev 8914).