Additional checks against crashes in the is_local_hostname()

OpenPrinting · Feb 18, 2020 · 4157690 · 4157690
1 parent 72052da
commit 4157690
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/NEWS b/NEWS
@@ -1,6 +1,11 @@
 NEWS - OpenPrinting CUPS Filters v1.27.1 - 2020-02-16
 -----------------------------------------------------
 
+CHANGES IN V1.27.2
+
+	- cups-browsed: Additional checks against crashes in the
+	  is_local_hostname() function (Ubuntu bug #1863716)
+
 CHANGES IN V1.27.1
 
 	- libcupsfilters: Let the PPD generator not put any dashes

diff --git a/utils/cups-browsed.c b/utils/cups-browsed.c
@@ -9134,13 +9134,17 @@ int
 is_local_hostname(const char *host_name) {
   char *host;
 
+  if (host_name == NULL)
+    return 0;
+
   for (host = (char *)cupsArrayFirst (local_hostnames);
        host != NULL;
        host = (char *)cupsArrayNext (local_hostnames))
     if (strncasecmp(host_name, host, strlen(host)) == 0 &&
 	(strlen(host_name) == strlen(host) ||
-	 strcasecmp(host_name + strlen(host), ".local") == 0 ||
-	 strcasecmp(host_name + strlen(host), ".local.") == 0))
+	 (strlen(host_name) > strlen(host) &&
+	  (strcasecmp(host_name + strlen(host), ".local") == 0 ||
+	   strcasecmp(host_name + strlen(host), ".local.") == 0))))
       return 1;
 
   return 0;