rpms/cups/F-11 cups-str3253.patch,NONE,1.1 cups.spec,1.487,1.488

[Tim Waugh]

Author: twaugh

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

Modified Files:
	cups.spec 
Added Files:
	cups-str3253.patch 
Log Message:
* Wed Jul 15 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.10
- Applied patch to prevent bad job control files crashing cupsd on
  start-up (STR #3253, bug #509741).


cups-str3253.patch:

--- NEW FILE cups-str3253.patch ---
diff -up cups-1.4rc1/scheduler/job.c.str3253 cups-1.4rc1/scheduler/job.c
--- cups-1.4rc1/scheduler/job.c.str3253	2009-07-15 11:19:37.613132688 +0100
+++ cups-1.4rc1/scheduler/job.c	2009-07-15 11:51:42.073132844 +0100
@@ -3443,11 +3443,8 @@ load_job_cache(const char *filename)	/* 
     {
       cupsArrayAdd(Jobs, job);
 
-      if (job->state_value <= IPP_JOB_STOPPED)
-      {
-        cupsArrayAdd(ActiveJobs, job);
-	cupsdLoadJob(job);
-      }
+      if (job->state_value <= IPP_JOB_STOPPED && cupsdLoadJob(job))
+	cupsArrayAdd(ActiveJobs, job);
 
       job = NULL;
     }
@@ -3699,18 +3696,19 @@ load_request_root(void)
       * Load the job...
       */
 
-      cupsdLoadJob(job);
-
-     /*
-      * Insert the job into the array, sorting by job priority and ID...
-      */
+      if (cupsdLoadJob(job))
+      {
+       /*
+        * Insert the job into the array, sorting by job priority and ID...
+        */
 
-      cupsArrayAdd(Jobs, job);
+	cupsArrayAdd(Jobs, job);
 
-      if (job->state_value <= IPP_JOB_STOPPED)
-        cupsArrayAdd(ActiveJobs, job);
-      else
-        unload_job(job);
+	if (job->state_value <= IPP_JOB_STOPPED)
+	  cupsArrayAdd(ActiveJobs, job);
+	else
+	  unload_job(job);
+      }
     }
 
   cupsDirClose(dir);


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.487
retrieving revision 1.488
diff -u -p -r1.487 -r1.488
--- cups.spec	15 Jul 2009 10:16:14 -0000	1.487
+++ cups.spec	15 Jul 2009 10:55:54 -0000	1.488
@@ -55,7 +55,8 @@ Patch28: cups-str3258.patch
 Patch29: cups-str3259.patch
 Patch30: cups-uri-compat.patch
 Patch31: cups-str3254.patch
-Patch32: cups-avahi.patch
+Patch32: cups-str3253.patch
+Patch33: cups-avahi.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -208,7 +209,8 @@ module. 
 %patch29 -p1 -b .str3259
 %patch30 -p1 -b .uri-compat
 %patch31 -p1 -b .str3254
-#%patch32 -p1 -b .avahi
+%patch32 -p1 -b .str3253
+#%patch33 -p1 -b .avahi
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -502,6 +504,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Wed Jul 15 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.10
+- Applied patch to prevent bad job control files crashing cupsd on
+  start-up (STR #3253, bug #509741).
 - Correctly handle CUPS-Get-PPDs requests for models with '+' in their
   names (STR #3254, bug #509586).
 - Accept incorrect device URIs in the (non-libusb) usb backend for