rpms/cups
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

better fix for STR#4687

Browse Source
This commit is contained in:
Jiri Popelka 2015-08-10 17:22:46 +02:00
parent 8d1f53d4a7
commit 6a53bfe80e
2 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
cups-journal.patch
View File

@ -1,12 +1,25 @@
diff -up cups-2.1rc1/scheduler/log.c.journal cups-2.1rc1/scheduler/log.c
--- cups-2.1rc1/scheduler/log.c.journal 2015-08-10 15:06:15.000000000 +0200
+++ cups-2.1rc1/scheduler/log.c 2015-08-10 15:07:30.046368863 +0200
@@ -690,7 +690,7 @@ cupsdLogJob(cupsd_job_t *job, /* I - Jo
va_end(ap);
- if (job)
+ if (job && printer)
sd_journal_send("MESSAGE=%s", log_line,
"PRIORITY=%i", log_levels[level],
From d6474c395e14b3079dd198fadf7427c67412e816 Mon Sep 17 00:00:00 2001
From: Jiri Popelka <jpopelka@redhat.com>
Date: Mon, 10 Aug 2015 17:12:32 +0200
Subject: [PATCH] Fix index out of range in cupsdLogJob()
---
scheduler/log.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scheduler/log.c b/scheduler/log.c
index cef0219..21489d5 100644
--- a/scheduler/log.c
+++ b/scheduler/log.c
@@ -667,7 +667,7 @@ cupsdLogJob(cupsd_job_t *job, /* I - Job */
PWG_Event"=JobStateChanged",
PWG_ServiceURI"=%s", printer ? printer->uri : "",
PWG_JobID"=%d", job->id,
- PWG_JobState"=%s", job_states[job->state_value - IPP_JSTATE_PENDING],
+ PWG_JobState"=%s", job->state_value >= IPP_JSTATE_PENDING ? job_states[job->state_value - IPP_JSTATE_PENDING] : "",
PWG_JobImpressionsCompleted"=%d", ippGetInteger(job->impressions, 0),
NULL);
else
--
2.5.0

5
cups.spec
View File

@ -14,7 +14,7 @@ Summary: CUPS printing system
Name: cups
Epoch: 1
Version: 2.1
Release: 0.1%{prever}%{?dist}
Release: 0.2%{prever}%{?dist}
License: GPLv2
Url: http://www.cups.org/
Source0: http://www.cups.org/software/%{VERSION}/cups-%{VERSION}-source.tar.bz2
@ -621,6 +621,9 @@ rm -f %{cups_serverbin}/backend/smb
%{_mandir}/man5/ipptoolfile.5.gz
%changelog
* Mon Aug 10 2015 Jiri Popelka <jpopelka@redhat.com> - 1:2.1-0.2rc1
- better fix for STR#4687
* Mon Aug 10 2015 Jiri Popelka <jpopelka@redhat.com> - 1:2.1-0.1rc1
- 2.1rc1