Fix an issue with the IPP backend and unsupported "sides" values (rdar://51775322)

diff --git a/.gitattributes b/.gitattributes
index 1a5c3e6c7b8f1bd08ae5051760131c5cc8dc92b7..2f20357d74c19f5aa54abd314f6fabb6dc676e87 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,5 @@
 .git* export-ignore
 .mailmap export-ignore
+examples/testfile.pcl -text
+exampels/testfile.txt -text
 scripts export-ignore

diff --git a/CHANGES.md b/CHANGES.md
index 06eba39b2a35f10c547f90d052c6945b94d5b2a3..c1211534b66251af03279e608c6d1230dd98be4a 100644 (file)
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -11,6 +11,8 @@ Changes in CUPS v2.3.0
 - Removed dead code from the scheduler (Issue #5593)
 - "make" failed with GZIP options (Issue #5595)
 - Fixed a NULL pointer dereference bug in `httpGetSubField2` (Issue #5598)
+- Fixed an issue with unsupported "sides" values in the IPP backend
+  (rdar://51775322)
 - Fixed an issue with `EXPECT !name WITH-VALUE ...` tests.
 - Fixed a command ordering issue in the Zebra ZPL driver.
 

diff --git a/backend/ipp.c b/backend/ipp.c
index 7851956dbadb21669ff25a4275ea62104e4080d1..8226acc7b074595d135d1dc632b14fd6ab26fd26 100644 (file)
--- a/backend/ipp.c
+++ b/backend/ipp.c
@@ -1504,7 +1504,7 @@ main(int  argc,                           /* I - Number of command-line args */
 
         const char *sides = cupsGetOption("sides", num_options, options);
 
-        if (!strncmp(sides, "two-sided-", 10))
+        if (!sides || !strncmp(sides, "two-sided-", 10))
         {
           fputs("DEBUG: Unable to do two-sided printing, setting sides to 'one-sided'.\n", stderr);
           num_options = cupsAddOption("sides", "one-sided", num_options, &options);