Merge relevant portion of _cupsGet1284Values changes in OpenPrinting …

…(Issue #5972)
apple · Oct 1, 2021 · 0067573 · 0067573
1 parent c702e85
commit 0067573
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/cups/options.c b/cups/options.c
@@ -603,16 +603,15 @@ _cupsGet1284Values(
  if (ptr < (value + sizeof(value) - 1))
  *ptr++ = *device_id;
 
- if (!*device_id)
- break;
-
  while (ptr > value && _cups_isspace(ptr[-1]))
  ptr --;
 
  *ptr = '\0';
- device_id ++;
-
  num_values = cupsAddOption(key, value, num_values, values);
+
+ if (!*device_id)
+ break;
+ device_id ++;
  }
 
  return (num_values);