From 71d10399824d686075736efdfa80bc4b95ac9e23 Mon Sep 17 00:00:00 2001 From: msweet Date: Thu, 13 Aug 2015 13:50:22 +0000 Subject: [PATCH] Fix another "new logging" bug for journald only this time (STR #4690) git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12843 a1ca3aef-8c08-0410-bb20-df032aa958be --- CHANGES.txt | 5 +++-- scheduler/log.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 3a6dc4ebbe..6068f76349 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,9 +1,10 @@ -CHANGES.txt - 2.1.0 - 2015-08-10 +CHANGES.txt - 2.1.0 - 2015-08-13 -------------------------------- CHANGES IN CUPS V2.1.0 - - Fixed one more scheduler crash bug in the new logging code (STR #4687) + - Fixed more scheduler crash bugs in the new logging code (STR #4687, + STR #4690) - Now support new Chinese locale IDs and their correct fallback locales (, ) - "make check" incorrectly reported an expectation of 18 warning diff --git a/scheduler/log.c b/scheduler/log.c index e606905296..c4ef0329fb 100644 --- a/scheduler/log.c +++ b/scheduler/log.c @@ -637,7 +637,7 @@ cupsdLogJob(cupsd_job_t *job, /* I - Job */ #elif defined(HAVE_SYSTEMD_SD_JOURNAL_H) if (!strcmp(ErrorLog, "syslog")) { - cupsd_printer_t *printer = job->printer ? job->printer : job->dest ? cupsdFindDest(job->dest) : NULL; + cupsd_printer_t *printer = job ? (job->printer ? job->printer : (job->dest ? cupsdFindDest(job->dest)) : NULL) : NULL; static const char * const job_states[] = { /* job-state strings */ "Pending", -- 2.47.2