Fix JSON and PPD/PS long number error handling (Issue #1608)

diff --git a/cups/json.c b/cups/json.c
index a71937f06a9d6e005bc5596f6ccc42019d9f2ac4..3b87359c7dcd499ec4ad5714c3714a5f2a29e7fe 100644 (file)
--- a/cups/json.c
+++ b/cups/json.c
@@ -1005,6 +1005,9 @@ cupsJSONImportString(const char *s)       // I - JSON string
         goto error;
 
       current->value.number = _cupsStrScand(s, (char **)&s, loc);
+      if (!s)
+        goto error;
+
       count ++;
       prev = current;
 

diff --git a/cups/raster-interpret.c b/cups/raster-interpret.c
index 69d7858e864f2852807e4e4f5904f59bc93d8e07..60aa04aeddcdb0177129c31794903048cbc0cd9d 100644 (file)
--- a/cups/raster-interpret.c
+++ b/cups/raster-interpret.c
@@ -1322,6 +1322,8 @@ scan_ps(_cups_ps_stack_t *st,             /* I  - Stack */
          */
 
          obj.value.number = _cupsStrScand(start, &cur, localeconv());
+         if (!cur)
+           return (NULL);
           break;
        }
        else