libcupsfilters: Fixed inconsistency between resolvers for DNS-SD-based URIs

(cherry picked from commit 80b6ad7)

Author: tillkamppeter

NEWS

@@ -1,6 +1,16 @@
 NEWS - OpenPrinting CUPS Filters v1.28.2 - 2020-09-10
 -----------------------------------------------------
 
+CHANGES IN V1.28.3
+
+	- libcupsfilters, cups-browsed: Fixed inconsistency between
+	  resolvers for DNS-SD-based URIs, resolve_uri() and
+	  ippfind_based_uri_converter(). Now both return a freeable
+	  string.
+	- libcupsfilters: Fix uninitialized buffer and parsing ippfind
+	  output in ippfind_based_uri_converter() function (Issue
+	  #308, Pull request #309).
+
 CHANGES IN V1.28.2
 
 	- driverless: Free allocated memory, use MAX_OUTPUT_LEN (Pull

cupsfilters/ipp.c

@@ -67,7 +67,7 @@ log_printf(char *log,
   va_end(arglist);
 }
 
-const char *
+char *
 resolve_uri(const char *raw_uri)
 {
   char *pseudo_argv[2];
@@ -91,7 +91,7 @@ resolve_uri(const char *raw_uri)
   dup2(fd1, 2);
   close(fd1);
 
-  return uri;
+  return (uri ? strdup(uri) : NULL);
 }
 
 #ifdef HAVE_CUPS_1_6
@@ -189,9 +189,9 @@ get_printer_attributes5(http_t *http_printer,
 			int* driverless_info,
 			int resolve_uri_type )
 {
-  const char *uri;
+  char *uri;
   int have_http, uri_status, host_port, i = 0, total_attrs = 0, fallback,
-    cap = 0, uri_alloc = 0;
+    cap = 0;
   char scheme[10], userpass[1024], host_name[1024], resource[1024];
   ipp_t *request, *response = NULL;
   ipp_attribute_t *attr;
@@ -247,11 +247,7 @@ get_printer_attributes5(http_t *http_printer,
   if(resolve_uri_type == CUPS_BACKEND_URI_CONVERTER)
     uri = resolve_uri(raw_uri);
   else
-  {
     uri = ippfind_based_uri_converter(raw_uri, resolve_uri_type);
-    if (uri != NULL)
-      uri_alloc = 1;
-  }
 
   if (uri == NULL)
   {
@@ -272,7 +268,7 @@ get_printer_attributes5(http_t *http_printer,
     log_printf(get_printer_attributes_log,
 	       "get-printer-attributes: Cannot parse the printer URI: %s\n",
 	       uri);
-    if (uri_alloc == 1) free(uri);
+    if (uri) free(uri);
     return NULL;
   }
 
@@ -285,7 +281,7 @@ get_printer_attributes5(http_t *http_printer,
       log_printf(get_printer_attributes_log,
 		 "get-printer-attributes: Cannot connect to printer with URI %s.\n",
 		 uri);
-      if (uri_alloc == 1) free(uri);
+      if (uri) free(uri);
       return NULL;
     }
   } else
@@ -383,7 +379,7 @@ get_printer_attributes5(http_t *http_printer,
       } else {
 	/* Suitable response, we are done */
 	if (have_http == 0) httpClose(http_printer);
-  if (uri_alloc == 1) free(uri);
+	if (uri) free(uri);
 	return response;
       }
     } else {
@@ -412,11 +408,11 @@ get_printer_attributes5(http_t *http_printer,
   }
 
   if (have_http == 0) httpClose(http_printer);
-  if (uri_alloc == 1) free(uri);
+  if (uri) free(uri);
   return NULL;
 }
 
-const char*
+char*
 ippfind_based_uri_converter (const char *uri, int is_fax)
 {
   int  ippfind_pid = 0,	        /* Process ID of ippfind for IPP */

cupsfilters/ipp.h

@@ -43,8 +43,8 @@ extern "C" {
 
 char get_printer_attributes_log[LOGSIZE];
 
-const char     *resolve_uri(const char *raw_uri);
-const char     *ippfind_based_uri_converter(const char *uri ,int is_fax);
+char     *resolve_uri(const char *raw_uri);
+char     *ippfind_based_uri_converter(const char *uri ,int is_fax);
 #ifdef HAVE_CUPS_1_6
                                 /* Enum of possible driverless options */
 enum driverless_support_modes {

utils/cups-browsed.c

@@ -3653,6 +3653,7 @@ local_printer_has_uri (gpointer key,
           dusername[64];           /* Discovered printer: URI's username */
   int     lport = 0,               /* Local printer: URI's port number */
           dport = 0;               /* Discovered printer: URI's port number */
+  char    *resolved_uri;
 
   debug_printf("local_printer_has_uri() in THREAD %ld\n", pthread_self());
   /* Separate the two URIs to be compared into their components */
@@ -3664,20 +3665,26 @@ local_printer_has_uri (gpointer key,
   memset(dusername, 0, sizeof(dusername));
   memset(dhost, 0, sizeof(dhost));
   memset(dresource, 0, sizeof(dresource));
-  if (printer && printer->device_uri)
-    httpSeparateURI (HTTP_URI_CODING_ALL, resolve_uri(printer->device_uri),
+  if (printer && printer->device_uri &&
+      (resolved_uri = resolve_uri(printer->device_uri)) != NULL) {
+    httpSeparateURI (HTTP_URI_CODING_ALL, resolved_uri,
 		     lscheme, sizeof(lscheme) - 1,
 		     lusername, sizeof(lusername) - 1,
 		     lhost, sizeof(lhost) - 1,
 		     &lport,
 		     lresource, sizeof(lresource) - 1);
-  if (device_uri)
-    httpSeparateURI (HTTP_URI_CODING_ALL, resolve_uri(device_uri),
+    free(resolved_uri);
+  }
+  if (device_uri &&
+      (resolved_uri = resolve_uri(device_uri)) != NULL) {
+    httpSeparateURI (HTTP_URI_CODING_ALL, resolved_uri,
 		     dscheme, sizeof(dscheme) - 1,
 		     dusername, sizeof(dusername) - 1,
 		     dhost, sizeof(dhost) - 1,
 		     &dport,
 		     dresource, sizeof(dresource) - 1);
+    free(resolved_uri);
+  }
   /* Consider not only absolutely equal URIs as equal
      but alo URIs which differ only by use of IPP or
      IPPS and/or have the IPP standard port 631
@@ -6815,6 +6822,7 @@ on_printer_modified (CupsNotifier *object,
   char          *new_queue_name;
   cups_array_t  *to_be_renamed;
   char          local_queue_uri[1024];
+  char          *resolved_uri = NULL;
 
   debug_printf("on_printer_modified() in THREAD %ld\n", pthread_self());
 
@@ -6894,9 +6902,10 @@ on_printer_modified (CupsNotifier *object,
 	  debug_printf("Printer with URI %s (or IPP/IPPS equivalent) already exists, no replacement queue to be created.\n",
 		       p->uri);
 	  re_create = 0;
-	} else if ((new_queue_name = /* Try to find a new queue name */
+	} else if ((resolved_uri = resolve_uri(p->uri)) == NULL ||
+		   (new_queue_name = /* Try to find a new queue name */
 		    get_local_queue_name(p->service_name, p->make_model,
-					 resolve_uri(p->uri), p->host,
+					 resolved_uri, p->host,
 					 &is_cups_queue,
 					 p->queue_name)) == NULL) {
 	  /* Not able to find a new name for the queue */
@@ -6914,6 +6923,7 @@ on_printer_modified (CupsNotifier *object,
 	    re_create = 0;
 	  }
 	}
+	if (resolved_uri) free(resolved_uri);
 	if (re_create) {
 	  p->overwritten = 0;
 	  p->status = STATUS_TO_BE_CREATED;