Fix bug in new cupsParseOptions2 implementation.

Fix bug in run-stp-tests.sh script.

diff --git a/cups/options.c b/cups/options.c
index 0f03583c8ce7e622525b2e760321f02c9ae8a35c..31b9580934e0d28026ccbdd981aea82ae78b38cd 100644 (file)
--- a/cups/options.c
+++ b/cups/options.c
@@ -311,7 +311,7 @@ cupsParseOptions2(
   }
 
   if (*copyarg == '{')
-    ptr  = copyarg + 1;
+    ptr = copyarg + 1;
   else
     ptr = copyarg;
 
@@ -334,7 +334,7 @@ cupsParseOptions2(
     // End after the closing brace...
     if (*ptr == '}' && *copyarg == '{')
     {
-      ptr ++;
+      *ptr++ = '\0';
       break;
     }
 
@@ -413,6 +413,12 @@ cupsParseOptions2(
         // Normal space-delimited string...
        while (*ptr && !_cups_isspace(*ptr))
        {
+         if (*ptr == '}' && *copyarg == '{')
+         {
+           *ptr++ = '\0';
+           break;
+         }
+
          if (*ptr == '\\' && ptr[1])
            _cups_strcpy(ptr, ptr + 1);
 

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index aca6eacf2fdb3e77532636deddc4d9638e8b98c7..a48a96acbea705f96684eaa886502b55c0a52990 100755 (executable)
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -3,7 +3,7 @@
 # Perform the complete set of IPP compliance tests specified in the
 # CUPS Software Test Plan.
 #
-# Copyright © 2020-2023 by OpenPrinting
+# Copyright © 2020-2024 by OpenPrinting
 # Copyright © 2007-2021 by Apple Inc.
 # Copyright © 1997-2007 by Easy Software Products, all rights reserved.
 #
@@ -28,12 +28,6 @@ fi
 
 umask 022
 
-#
-# Make the IPP test program...
-#
-
-make
-
 #
 # Solaris has a non-POSIX grep in /bin...
 #