More strdup checks (Issue #113)

michaelrsweet · Dec 29, 2020 · 5285563 · 5285563
1 parent 6868546
commit 5285563
Show file tree

Hide file tree

Showing 8 changed files with 73 additions and 11 deletions.
diff --git a/pappl/job.c b/pappl/job.c
@@ -365,10 +365,19 @@ _papplJobSubmitFile(
   else
   {
     // Abort the job...
-    job->state = IPP_JSTATE_ABORTED;
+    job->state     = IPP_JSTATE_ABORTED;
+    job->completed = time(NULL);
 
     papplLogJob(job, PAPPL_LOGLEVEL_ERROR, "Unable to allocate filename.");
     unlink(filename);
+
+    pthread_rwlock_wrlock(&job->printer->rwlock);
+    cupsArrayRemove(job->printer->active_jobs, job);
+    cupsArrayAdd(job->printer->completed_jobs, job);
+    pthread_rwlock_unlock(&job->printer->rwlock);
+
+    if (!job->system->clean_time)
+      job->system->clean_time = time(NULL) + 60;
   }
 }
 

diff --git a/pappl/mainloop-subcommands.c b/pappl/mainloop-subcommands.c
@@ -1262,6 +1262,12 @@ copy_printer(_pappl_ml_printer_t *p)	// I - Printer to copy
     np->seen       = p->seen;
     np->device_uri = strdup(p->device_uri);
     np->device_id  = p->device_id ? strdup(p->device_id) : NULL;
+
+    if (!np->device_uri || (p->name && !np->name) || (p->device_id && !np->device_id))
+    {
+      free_printer(np);
+      return (NULL);
+    }
   }
 
   return (np);

diff --git a/pappl/printer-raw.c b/pappl/printer-raw.c
@@ -168,8 +168,13 @@ _papplPrinterRunRaw(
 	  }
 
 	  // Finish the job...
-	  job->filename = strdup(filename);
-	  job->state    = IPP_JSTATE_PENDING;
+	  if ((job->filename = strdup(filename)) == NULL)
+	  {
+            unlink(filename);
+	    goto abort_job;
+	  }
+
+	  job->state = IPP_JSTATE_PENDING;
 
 	  _papplPrinterCheckJobs(printer);
 	  continue;

diff --git a/pappl/printer.c b/pappl/printer.c
@@ -279,6 +279,13 @@ papplPrinterCreate(
   printer->usb_vendor_id      = 0x1209;	// See <pid.codes>
   printer->usb_product_id     = 0x8011;
 
+  if (!printer->name || !printer->dns_sd_name || !printer->resource || (device_id && !printer->device_id) || !printer->device_uri || !printer->driver_name || !printer->attrs)
+  {
+    // Failed to allocate one of the required members...
+    _papplPrinterDelete(printer);
+    return (NULL);
+  }
+
   if (papplSystemGetDefaultPrintGroup(system, print_group, sizeof(print_group)))
     papplPrinterSetPrintGroup(printer, print_group);
 
@@ -365,7 +372,11 @@ papplPrinterCreate(
     *ptr = '\0';
 
     snprintf(temp_id, sizeof(temp_id), "MFG:%s;MDL:%s;CMD:%s;", mfg, mdl, cmd);
-    printer->device_id = strdup(temp_id);
+    if ((printer->device_id = strdup(temp_id)) == NULL)
+    {
+      _papplPrinterDelete(printer);
+      return (NULL);
+    }
   }
 
   // charset-configured

diff --git a/pappl/resource.c b/pappl/resource.c
@@ -461,6 +461,12 @@ copy_resource(_pappl_resource_t *r)	// I - Resource to copy
       newr->filename = strdup(r->filename);
     if (r->language)
       newr->language = strdup(r->language);
+
+    if (!newr->path || !newr->format || (r->filename && !newr->filename) || (r->language && !newr->language))
+    {
+      free_resource(newr);
+      return (NULL);
+    }
   }
 
   return (newr);

diff --git a/pappl/system-ipp.c b/pappl/system-ipp.c
@@ -496,7 +496,7 @@ ipp_get_system_attributes(
   if (!ra || cupsArrayFind(ra, "system-up-time"))
     ippAddInteger(client->response, IPP_TAG_SYSTEM, IPP_TAG_INTEGER, "system-up-time", (int)(time(NULL) - system->start_time));
 
-  if (!ra || cupsArrayFind(ra, "system-uuid"))
+  if (system->uuid && (!ra || cupsArrayFind(ra, "system-uuid")))
     ippAddString(client->response, IPP_TAG_SYSTEM, IPP_TAG_URI, "system-uuid", NULL, system->uuid);
 
   if (!ra || cupsArrayFind(ra, "system-xri-supported"))

diff --git a/pappl/system-loadsave.c b/pappl/system-loadsave.c
@@ -110,7 +110,13 @@ papplSystemLoadState(
     else if (!strcasecmp(line, "NextPrinterID") && value)
       system->next_printer_id = (int)strtol(value, NULL, 10);
     else if (!strcasecmp(line, "UUID") && value)
-      system->uuid = strdup(value);
+    {
+      if ((system->uuid = strdup(value)) == NULL)
+      {
+        papplLog(system, PAPPL_LOGLEVEL_ERROR, "Unable to allocate memory for system UUID.");
+        return (false);
+      }
+    }
     else if (!strcasecmp(line, "<Printer") && value)
     {
       // Read a printer...
@@ -285,7 +291,14 @@ papplSystemLoadState(
 	  }
 
 	  if ((job_value = cupsGetOption("filename", num_options, options)) != NULL)
-	    job->filename = strdup(job_value);
+	  {
+	    if ((job->filename = strdup(job_value)) == NULL)
+	    {
+	      papplLog(system, PAPPL_LOGLEVEL_ERROR, "Error creating job %s for printer %s", job_name, printer->name);
+	      break;
+	    }
+	  }
+
 	  if ((job_value = cupsGetOption("state", num_options, options)) != NULL)
 	    job->state = (ipp_jstate_t)strtol(job_value, NULL, 10);
 	  if ((job_value = cupsGetOption("state_reasons", num_options, options)) != NULL)
@@ -306,7 +319,8 @@ papplSystemLoadState(
 	  {
 	    // Load the file attributes from the spool directory...
 	    int		attr_fd;	// Attribute file descriptor
-	    char	job_attr_filename[256];		// Attribute filename
+	    char	job_attr_filename[256];
+					// Attribute filename
 
 	    if ((attr_fd = papplJobOpenFile(job, job_attr_filename, sizeof(job_attr_filename), system->directory, "ipp", "r")) < 0)
 	    {

diff --git a/pappl/system.c b/pappl/system.c
@@ -188,6 +188,9 @@ papplSystemCreate(
   system->admin_gid       = (gid_t)-1;
   system->auth_service    = auth_service ? strdup(auth_service) : NULL;
 
+  if (!system->name || !system->dns_sd_name || (spooldir && !system->directory) || (logfile && !system->logfile) || (subtypes && !system->subtypes) || (auth_service && !system->auth_service))
+    goto fatal;
+
   // Make sure the system name and UUID are initialized...
   papplSystemSetHostname(system, NULL);
   papplSystemSetUUID(system, NULL);
@@ -208,7 +211,8 @@ papplSystemCreate(
     char	newspooldir[256];	// Spool directory
 
     snprintf(newspooldir, sizeof(newspooldir), "%s/pappl%d.d", tmpdir, (int)getpid());
-    system->directory = strdup(newspooldir);
+    if ((system->directory = strdup(newspooldir)) == NULL)
+      goto fatal;
   }
 
   if (mkdir(system->directory, 0700) && errno != EEXIST)
@@ -228,7 +232,8 @@ papplSystemCreate(
 
     snprintf(newlogfile, sizeof(newlogfile), "%s/pappl%d.log", tmpdir, (int)getpid());
 
-    system->logfile = strdup(newlogfile);
+    if ((system->logfile = strdup(newlogfile)) == NULL)
+      goto fatal;
   }
 
   _papplLogOpen(system);
@@ -463,7 +468,13 @@ papplSystemRun(pappl_system_t *system)	// I - System
     // main name...
     strlcpy(header, "Unknown PAPPL/" PAPPL_VERSION " CUPS IPP/2.0", sizeof(header));
   }
-  system->server_header = strdup(header);
+
+  if ((system->server_header = strdup(header)) == NULL)
+  {
+    papplLog(system, PAPPL_LOGLEVEL_FATAL, "Unable to allocate Server header value.");
+    system->is_running = false;
+    return;
+  }
 
   // Make the static attributes...
   make_attributes(system);