From: Michael R Sweet <michael.r.sweet@gmail.com>
Date: Thu, 21 Feb 2019 16:14:12 +0000 (-0500)
Subject: The lpadmin command would hang with a bad PPD file (rdar://41495016)
X-Git-Tag: v2.2.11~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=606cfe8cb99395c1a868946c7716288c693889a8;p=thirdparty%2Fcups.git

The lpadmin command would hang with a bad PPD file (rdar://41495016)
---

diff --git a/CHANGES.md b/CHANGES.md
index 57bd5f85c0..7a9c1350ea 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -27,6 +27,7 @@ Changes in CUPS v2.2.11
 - Added a USB quirks rule for Xerox printers (Issue #5523)
 - The scheduler's self-signed certificate did not include all of the alternate
   names for the server when using GNU TLS (Issue #5525)
+- The lpadmin command would hang with a bad PPD file (rdar://41495016)
 - Fixed a potential crash bug in cups-driverd (rdar://46625579)
 - Fixed a performance regression with large PPDs (rdar://47040759)
 - The scheduler did not always idle exit as quickly as it could.
diff --git a/systemv/lpadmin.c b/systemv/lpadmin.c
index 85604ac401..cb9a9ba819 100644
--- a/systemv/lpadmin.c
+++ b/systemv/lpadmin.c
@@ -1450,6 +1450,7 @@ set_printer_options(
 					/* Status code */
 
       _cupsLangPrintf(stderr, _("lpadmin: Unable to open PPD \"%s\": %s on line %d."), ppdfile, ppdErrorString(status), linenum);
+      return (1);
     }
 
     ppdMarkDefaults(ppd);