More Coverity fixes.

michaelrsweet · Jan 25, 2024 · b88bc4b · b88bc4b
1 parent 368c385
commit b88bc4b
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 15 deletions.
diff --git a/pappl/job.c b/pappl/job.c
@@ -807,6 +807,8 @@ _papplJobSubmitFile(
       headersize = read(fd, (char *)header, sizeof(header));
       close(fd);
 
+      _papplRWLockRead(job->system);
+
       if (!memcmp(header, "%PDF", 4))
 	job->format = "application/pdf";
       else if (!memcmp(header, "%!", 2))
@@ -821,6 +823,8 @@ _papplJobSubmitFile(
 	job->format = "image/urf";
       else if (job->system->mime_cb)
 	job->format = (job->system->mime_cb)(header, (size_t)headersize, job->system->mime_cbdata);
+
+      _papplRWUnlock(job->system);
     }
   }
 

diff --git a/pappl/log.c b/pappl/log.c
@@ -86,7 +86,7 @@ papplLog(pappl_system_t   *system,	// I - System
     return;
   }
 
-  if (level < system->loglevel)
+  if (level < papplSystemGetLogLevel(system))
     return;
 
   va_start(ap, message);
@@ -128,7 +128,7 @@ _papplLogAttributes(
   if (!client || !title || !ipp)
     return;
 
-  if (client->system->loglevel > PAPPL_LOGLEVEL_DEBUG)
+  if (papplSystemGetLogLevel(client->system) > PAPPL_LOGLEVEL_DEBUG)
     return;
 
   major = ippGetVersion(ipp, &minor);
@@ -188,7 +188,7 @@ papplLogClient(
   if (!client || !message)
     return;
 
-  if (level < client->system->loglevel)
+  if (level < papplSystemGetLogLevel(client->system))
     return;
 
   snprintf(cmessage, sizeof(cmessage), "[Client %d] %s", client->number, message);
@@ -255,7 +255,7 @@ papplLogJob(
   if (!job || !message)
     return;
 
-  if (level < job->system->loglevel)
+  if (level < papplSystemGetLogLevel(job->system))
     return;
 
   snprintf(jmessage, sizeof(jmessage), "[Job %d] %s", job->job_id, message);
@@ -347,7 +347,7 @@ papplLogPrinter(
   if (!printer || !message)
     return;
 
-  if (level < printer->system->loglevel)
+  if (level < papplSystemGetLogLevel(printer->system))
     return;
 
   // Prefix the message with "[Printer foo]", making sure to not insert any

diff --git a/pappl/printer-accessors.c b/pappl/printer-accessors.c
@@ -902,12 +902,12 @@ papplPrinterOpenDevice(
   pappl_device_t	*device = NULL;	// Open device
 
 
-  if (!printer || printer->device_in_use || printer->processing_job || !printer->device_uri)
+  if (!printer)
     return (NULL);
 
   _papplRWLockWrite(printer);
 
-  if (!printer->device_in_use && !printer->processing_job)
+  if (!printer->device_in_use && !printer->processing_job && printer->device_uri)
   {
 //    papplLogPrinter(printer, PAPPL_LOGLEVEL_DEBUG, "Opening device for status/maintenance.");
 

diff --git a/pappl/printer-ipp.c b/pappl/printer-ipp.c
@@ -1,17 +1,13 @@
 //
 // Printer IPP processing for the Printer Application Framework
 //
-// Copyright © 2019-2023 by Michael R Sweet.
+// Copyright © 2019-2024 by Michael R Sweet.
 // Copyright © 2010-2019 by Apple Inc.
 //
 // Licensed under Apache License v2.0.  See the file "LICENSE" for more
 // information.
 //
 
-//
-// Include necessary headers...
-//
-
 #include "pappl-private.h"
 
 
@@ -1630,10 +1626,20 @@ ipp_get_printer_attributes(
 					// Printer
 
 
+  _papplRWLockRead(printer->system);
+  _papplRWLockRead(printer);
+
   if (!printer->device_in_use && !printer->processing_job && (time(NULL) - printer->status_time) > 1 && printer->driver_data.status_cb)
   {
     // Update printer status...
+    _papplRWUnlock(printer);
+    _papplRWUnlock(printer->system);
+
     (printer->driver_data.status_cb)(printer);
+
+    _papplRWLockRead(printer->system);
+    _papplRWLockWrite(printer);
+
     printer->status_time = time(NULL);
   }
 
@@ -1642,8 +1648,6 @@ ipp_get_printer_attributes(
 
   papplClientRespondIPP(client, IPP_STATUS_OK, NULL);
 
-  _papplRWLockRead(printer->system);
-  _papplRWLockRead(printer);
   _papplPrinterCopyAttributesNoLock(printer, client, ra, ippGetString(ippFindAttribute(client->request, "document-format", IPP_TAG_MIMETYPE), 0, NULL));
   _papplRWUnlock(printer);
   _papplRWUnlock(printer->system);

diff --git a/pappl/printer-usb.c b/pappl/printer-usb.c
@@ -417,7 +417,7 @@ papplPrinterSetUSB(
     _papplRWUnlock(printer);
 
     // Start USB gadget if needed...
-    if (printer->system->is_running && printer->system->default_printer_id == printer->printer_id && (printer->system->options & PAPPL_SOPTIONS_USB_PRINTER))
+    if (papplSystemIsRunning(printer->system) && papplSystemGetDefaultPrinterID(printer->system) == printer->printer_id && (printer->system->options & PAPPL_SOPTIONS_USB_PRINTER))
     {
       pthread_t	tid;			// Thread ID
 

diff --git a/xcode/pappl.xcodeproj/project.pbxproj b/xcode/pappl.xcodeproj/project.pbxproj
@@ -1184,6 +1184,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_ANALYZER_GCD_PERFORMANCE = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@@ -1277,6 +1278,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_ANALYZER_GCD_PERFORMANCE = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;