rpms/cups/devel cups-str3262.patch,NONE,1.1 cups.spec,1.487,1.488

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12053

Modified Files:
	cups.spec 
Added Files:
	cups-str3262.patch 
Log Message:
* Tue Jul 28 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.12
- Prevent ipp backend looping with bad IPP devices (bug #476424,
  STR #3262).


cups-str3262.patch:
 ipp.c |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

--- NEW FILE cups-str3262.patch ---
diff -up cups-1.4rc1/backend/ipp.c.str3262 cups-1.4rc1/backend/ipp.c
--- cups-1.4rc1/backend/ipp.c.str3262	2009-07-28 13:12:55.021509189 +0100
+++ cups-1.4rc1/backend/ipp.c	2009-07-28 13:13:19.817508734 +0100
@@ -1315,7 +1315,16 @@ main(int  argc,				/* I - Number of comm
       if (response)
       {
 	if ((job_state = ippFindAttribute(response, "job-state",
-	                                  IPP_TAG_ENUM)) != NULL)
+	                                  IPP_TAG_ENUM)) == NULL)
+	{
+	  ippDelete(response);
+
+	  _cupsLangPrintf(stderr,
+			  _("ERROR: Unable to get job-state for job %d!\n"),
+			  job_id);
+	  break;
+	}
+	else
 	{
 	 /*
           * Stop polling if the job is finished or pending-held...


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.487
retrieving revision 1.488
diff -u -p -r1.487 -r1.488
--- cups.spec	28 Jul 2009 11:53:09 -0000	1.487
+++ cups.spec	28 Jul 2009 12:22:39 -0000	1.488
@@ -57,7 +57,8 @@ Patch30: cups-uri-compat.patch
 Patch31: cups-str3254.patch
 Patch32: cups-str3253.patch
 Patch33: cups-str3266.patch
-Patch34: cups-avahi.patch
+Patch34: cups-str3262.patch
+Patch35: cups-avahi.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -212,7 +213,8 @@ module. 
 %patch31 -p1 -b .str3254
 %patch32 -p1 -b .str3253
 %patch33 -p1 -b .str3266
-#%patch34 -p1 -b .avahi
+%patch34 -p1 -b .str3262
+#%patch35 -p1 -b .avahi
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -506,6 +508,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Tue Jul 28 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.12
+- Prevent ipp backend looping with bad IPP devices (bug #476424,
+  STR #3262).
 - Fixed Device ID reporting in the usb backend (STR #3266).
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.4-0.rc1.11.1