Fix parsing bug in new cupsParseOptions implementation.

michaelrsweet · michaelrsweet · commit 0542b9d0dc7a · 2024-10-19T16:44:44.000-04:00
diff --git a/cups/options.c b/cups/options.c
@@ -261,7 +261,7 @@ cupsParseOptions(
     // End after the closing brace...
     if (*ptr == '}' && *copyarg == '{')
     {
-      ptr ++;
+      *ptr++ = '\0';
       break;
     }
 
@@ -340,6 +340,12 @@ cupsParseOptions(
         // Normal space-delimited string...
 	while (*ptr && !_cups_isspace(*ptr))
 	{
+	  if (*ptr == '}' && *copyarg == '{')
+	  {
+	    *ptr++ = '\0';
+	    break;
+	  }
+
 	  if (*ptr == '\\' && ptr[1])
 	    _cups_strcpy(ptr, ptr + 1);
 

Original file line number	Diff line number	Diff line change
`@@ -261,7 +261,7 @@ cupsParseOptions(`
`261`	`261`	`// End after the closing brace...`
`262`	`262`	`if (ptr == '}' && copyarg == '{')`
`263`	`263`	`{`
`264`		`- ptr ++;`
	`264`	`+ *ptr++ = '\0';`
`265`	`265`	`break;`
`266`	`266`	`}`
`267`	`267`
`@@ -340,6 +340,12 @@ cupsParseOptions(`
`340`	`340`	`// Normal space-delimited string...`
`341`	`341`	`while (ptr && !_cups_isspace(ptr))`
`342`	`342`	`{`
	`343`	`+ if (ptr == '}' && copyarg == '{')`
	`344`	`+ {`
	`345`	`+ *ptr++ = '\0';`
	`346`	`+ break;`
	`347`	`+ }`
	`348`	`+`
`343`	`349`	`if (*ptr == '\\' && ptr[1])`
`344`	`350`	`_cups_strcpy(ptr, ptr + 1);`
`345`	`351`