Check for failed buf allocations yajl_parser

brianmario · Apr 4, 2022 · bef7072 · bef7072
1 parent 09bc860
commit bef7072
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/ext/yajl/api/yajl_parse.h b/ext/yajl/api/yajl_parse.h
@@ -55,7 +55,9 @@ extern "C" {
         yajl_status_insufficient_data,
         /** An error occured during the parse.  Call yajl_get_error for
          *  more information about the encountered error */
-        yajl_status_error
+        yajl_status_error,
+        /** an allocation failed */
+        yajl_status_alloc_failed,
     } yajl_status;
 
     /** attain a human readable, english, string for an error */

diff --git a/ext/yajl/yajl.c b/ext/yajl/yajl.c
@@ -56,6 +56,9 @@ yajl_status_to_string(yajl_status stat)
         case yajl_status_error:
             statStr = "parse error";
             break;
+        case yajl_status_alloc_failed:
+            statStr = "allocation failed";
+            break;
     }
     return statStr;
 }

diff --git a/ext/yajl/yajl_ext.c b/ext/yajl/yajl_ext.c
@@ -314,11 +314,17 @@ void yajl_parse_chunk(const unsigned char * chunk, unsigned int len, yajl_handle
 
     stat = yajl_parse(parser, chunk, len);
 
-    if (stat != yajl_status_ok && stat != yajl_status_insufficient_data) {
+    if (stat == yajl_status_ok || stat == yajl_status_insufficient_data) {
+        // success
+    } else if (stat == yajl_status_error) {
         unsigned char * str = yajl_get_error(parser, 1, chunk, len);
         VALUE errobj = rb_exc_new2(cParseError, (const char*) str);
         yajl_free_error(parser, str);
         rb_exc_raise(errobj);
+    } else {
+        const char * str = yajl_status_to_string(stat);
+        VALUE errobj = rb_exc_new2(cParseError, (const char*) str);
+        rb_exc_raise(errobj);
     }
 }
 

diff --git a/ext/yajl/yajl_parser.c b/ext/yajl/yajl_parser.c
@@ -185,6 +185,8 @@ yajl_do_parse(yajl_handle hand, const unsigned char * jsonText,
                     if (hand->callbacks && hand->callbacks->yajl_string) {
                         yajl_buf_clear(hand->decodeBuf);
                         yajl_string_decode(hand->decodeBuf, buf, bufLen);
+                        if (yajl_buf_err(hand->decodeBuf))
+                            return yajl_status_alloc_failed;
                         _CC_CHK(hand->callbacks->yajl_string(
                                     hand->ctx, yajl_buf_data(hand->decodeBuf),
                                     yajl_buf_len(hand->decodeBuf)));