diff --git a/CHANGES-OPENPRINTING.md b/CHANGES-OPENPRINTING.md
index 0bd7874854..b74898bb34 100644
--- a/CHANGES-OPENPRINTING.md
+++ b/CHANGES-OPENPRINTING.md
@@ -13,7 +13,7 @@ Changes in CUPS v2.3.3op1
 - Updated ippfind to honor `SKIP-XXX` directives with `PAUSE`.
 - Fixed IPP Everywhere v1.1 conformance issues in ippeveprinter.
 - Fixed DNS-SD name collision support in ippeveprinter.
-- Fixed compiler warnings.
+- Fixed compiler and code analyzer warnings.
 - Fixed TLS support on Windows.
 - Fixed ippfind sub-type searches with Avahi.
 - Fixed the default hostname used by ippeveprinter on macOS.
diff --git a/filter/rastertoepson.c b/filter/rastertoepson.c
index 4522e6b480..be3bd5e0e1 100644
--- a/filter/rastertoepson.c
+++ b/filter/rastertoepson.c
@@ -955,7 +955,7 @@ OutputRows(
   * Clear the buffer...
   */
 
-  memset(LineBuffers[row], 0, header->cupsWidth * DotBytes);
+  memset(LineBuffers[row], 0, (size_t)header->cupsWidth * (size_t)DotBytes);
 }
 
 
diff --git a/filter/rastertohp.c b/filter/rastertohp.c
index 0d76c42a28..409b1c9359 100644
--- a/filter/rastertohp.c
+++ b/filter/rastertohp.c
@@ -332,7 +332,7 @@ StartPage(ppd_file_t         *ppd,	/* I - PPD file */
     Planes[plane] = Planes[0] + plane * header->cupsBytesPerLine / NumPlanes;
 
   if (ColorBits > 1)
-    BitBuffer = malloc(ColorBits * ((header->cupsWidth + 7) / 8));
+    BitBuffer = malloc((size_t)ColorBits * (((size_t)header->cupsWidth + 7) / 8));
   else
     BitBuffer = NULL;