Handle yet another out-of-memory condition.

duplocale() can return NULL, with errno set to ENOMEM.
In this case, bail out and set the current error code to
json_tokener_error_memory.

diff --git a/json_tokener.c b/json_tokener.c
index cc355277383300b4f462612d8743383193ba3c66..0a86d82108a2cc8de84737d303c1820a51c5bd85 100644 (file)
--- a/json_tokener.c
+++ b/json_tokener.c
@@ -341,6 +341,11 @@ struct json_object *json_tokener_parse_ex(struct json_tokener *tok, const char *
 #ifdef HAVE_USELOCALE
        {
                locale_t duploc = duplocale(oldlocale);
+               if (duploc == NULL && errno == ENOMEM)
+               {
+                       tok->err = json_tokener_error_memory;
+                       return NULL;
+               }
                newloc = newlocale(LC_NUMERIC_MASK, "C", duploc);
                if (newloc == NULL)
                {