Fix A6 crash bug in Epson 24-pin driver (Issue #5323)

diff --git a/CHANGES.md b/CHANGES.md
index 4fa1803cd1999139da3fe1dfff9590de3641b3d9..e6a01557fccd2f9da44d9b3d7fb0626d296ad5d0 100644 (file)
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -7,6 +7,7 @@ Changes in CUPS v2.3b6
 - Localization update (Issue #5339)
 - Fixed a regression in the changes to ippValidateAttribute (Issue #5322,
   Issue #5330)
+- Fixed a crash bug in the Epson dot matrix driver (Issue #5323)
 - The web interface did not list the IPP Everywhere "driver" (Issue #5338)
 - The scheduler did not report all of the supported job options and values
   (Issue #5340)

diff --git a/filter/rastertoepson.c b/filter/rastertoepson.c
index 73e8d0600569c8587001cec0f1be4e63f86e63bb..4522e6b48083957eaa4c5253e169f178ae01c6a5 100644 (file)
--- a/filter/rastertoepson.c
+++ b/filter/rastertoepson.c
@@ -1,10 +1,11 @@
 /*
  * EPSON ESC/P and ESC/P2 filter for CUPS.
  *
- * Copyright 2007-2015 by Apple Inc.
+ * Copyright 2007-2018 by Apple Inc.
  * Copyright 1993-2007 by Easy Software Products.
  *
- * Licensed under Apache License v2.0.  See the file "LICENSE" for more information.
+ * Licensed under Apache License v2.0.  See the file "LICENSE" for more
+ * information.
  */
 
 /*
@@ -301,7 +302,7 @@ StartPage(
 
   if (DotBytes)
   {
-    if ((LineBuffers[0] = calloc((size_t)DotBytes, header->cupsWidth * (size_t)(Shingling + 1))) == NULL)
+    if ((LineBuffers[0] = calloc((size_t)DotBytes, (header->cupsWidth + 7) * (size_t)(Shingling + 1))) == NULL)
     {
       fputs("ERROR: Unable to allocate memory\n", stderr);
       exit(1);

diff --git a/scheduler/org.cups.cups-lpd.plist b/scheduler/org.cups.cups-lpd.plist
index 1be5987831de42a1f35ed41b486b120b5cdff52e..d92678ac1932fa76d4865ccb4e48483ea3575ee3 100644 (file)
--- a/scheduler/org.cups.cups-lpd.plist
+++ b/scheduler/org.cups.cups-lpd.plist
@@ -29,7 +29,7 @@
                </dict>
        </dict>
        <key>UserName</key>
-       <string>_lp</string>
+       <string>lp</string>
        <key>inetdCompatibility</key>
        <dict>
                <key>Wait</key>