Cherry-pick the fix for OpenPrinting#314 and push it to 1.x

zdohnal · Dec 7, 2020 · 32bfedf · 32bfedf
1 parent 39e1647
commit 32bfedf
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/NEWS b/NEWS
@@ -9,6 +9,8 @@ CHANGES IN V1.28.7
 	- libcupsfilters: Fixed addition of grayscale mode in
 	  generated PPD files, to avoid duplicate entries
 	  (OpenPrinting CUPS issue #59).
+	- libcupsfilters: Added NULL check when removing ".Borderless"
+	  suffixes from page size names (Issue #314).
 
 CHANGES IN V1.28.6
 

diff --git a/cupsfilters/ppdgenerator.c b/cupsfilters/ppdgenerator.c
@@ -2226,7 +2226,8 @@ ppdCreateFromIPP2(char         *buffer,          /* I - Filename buffer */
 
     if (all_borderless) {
       suffix = strcasestr(ppdname, ".Borderless");
-      *suffix = '\0';
+      if (suffix)
+	*suffix = '\0';
     }
 
     cupsFilePrintf(fp, "*OpenUI *PageSize/%s: PickOne\n"
@@ -2260,7 +2261,8 @@ ppdCreateFromIPP2(char         *buffer,          /* I - Filename buffer */
 
       if (all_borderless) {
 	suffix = strcasestr(ppdsizename, ".Borderless");
-	*suffix = '\0';
+	if (suffix)
+	  *suffix = '\0';
       }
 
       cupsFilePrintf(fp, "*PageSize %s%s%s%s: \"<</PageSize[%s %s]>>setpagedevice\"\n",
@@ -2304,7 +2306,8 @@ ppdCreateFromIPP2(char         *buffer,          /* I - Filename buffer */
 
       if (all_borderless) {
 	suffix = strcasestr(ppdsizename, ".Borderless");
-	*suffix = '\0';
+	if (suffix)
+	  *suffix = '\0';
       }
 
       cupsFilePrintf(fp, "*PageRegion %s%s%s%s: \"<</PageSize[%s %s]>>setpagedevice\"\n",
@@ -2340,7 +2343,8 @@ ppdCreateFromIPP2(char         *buffer,          /* I - Filename buffer */
 
       if (all_borderless) {
 	suffix = strcasestr(ppdsizename, ".Borderless");
-	*suffix = '\0';
+	if (suffix)
+	  *suffix = '\0';
       }
 
       cupsFilePrintf(fp, "*ImageableArea %s: \"%s %s %s %s\"\n", ppdsizename,