Merge relevant portion of _cupsGet1284Values changes in OpenPrinting (Issue #5972)

1 files changed, 4 insertions, 5 deletions

diff --git a/cups/options.c b/cups/options.c
index 11814c9af..e45858c2c 100644
--- 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);