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

diff --git a/CHANGES.md b/CHANGES.md
index 57bd5f85c0563852fb4dfccb5d3a2a8b29be54c3..7a9c1350eafeed2790c6864363d843fa1634ca7d 100644 (file)
--- 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 85604ac401d4190f61c5f7835f03d79156112e1a..cb9a9ba8197a00b308a0f6c4ac2aae3ab2376782 100644 (file)
--- 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);