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

diff --git a/CHANGES.txt b/CHANGES.txt
index 3a6dc4ebbe1e72a93c141b3fef9d8e6983403e62..6068f76349cbf79891ce09238d365776cf3d9931 100644 (file)
--- 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
          (<rdar://problem/22086642>, <rdar://problem/22130168>)
        - "make check" incorrectly reported an expectation of 18 warning

diff --git a/scheduler/log.c b/scheduler/log.c
index e606905296b84dc22784b7ea589d7936cb5ad788..c4ef0329fb4c7899cb92fa493328ba83588c898a 100644 (file)
--- 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",