Sync up with some fixes from CUPS 2.5.x.

michaelrsweet · michaelrsweet · commit fb98950f2d6d · 2026-04-05T10:01:51.000-04:00
diff --git a/cups/http.c b/cups/http.c
@@ -1,7 +1,7 @@
 //
 // HTTP routines for CUPS.
 //
-// Copyright © 2021-2025 by OpenPrinting.
+// Copyright © 2021-2026 by OpenPrinting.
 // Copyright © 2007-2021 by Apple Inc.
 // Copyright © 1997-2007 by Easy Software Products, all rights reserved.
 //
@@ -1662,7 +1662,6 @@ httpPeek(http_t *http,			// I - HTTP connection
     {
       DEBUG_puts("2httpPeek: Unable to copy decompressor stream.");
       http->error = ENOMEM;
-      inflateEnd(&stream);
       return (-1);
     }
 
diff --git a/cups/raster-stream.c b/cups/raster-stream.c
@@ -1098,6 +1098,9 @@ cupsRasterWriteHeader(
 
   if (r->mode == CUPS_RASTER_WRITE_APPLE)
   {
+    if (r->header.HWResolution[0] == 0 || r->header.HWResolution[1] == 0)
+      return (0);
+
     r->rowheight = r->header.HWResolution[0] / r->header.HWResolution[1];
 
     if (r->header.HWResolution[0] != (r->rowheight * r->header.HWResolution[1]))

Original file line number	Diff line number	Diff line change
`@@ -1098,6 +1098,9 @@ cupsRasterWriteHeader(`
`1098`	`1098`
`1099`	`1099`	`if (r->mode == CUPS_RASTER_WRITE_APPLE)`
`1100`	`1100`	`{`
	`1101`	`+ if (r->header.HWResolution[0] == 0 \|\| r->header.HWResolution[1] == 0)`
	`1102`	`+ return (0);`
	`1103`	`+`
`1101`	`1104`	`r->rowheight = r->header.HWResolution[0] / r->header.HWResolution[1];`
`1102`	`1105`
`1103`	`1106`	`if (r->header.HWResolution[0] != (r->rowheight * r->header.HWResolution[1]))`