From: William Dignazio <slackwill@csh.rit.edu>
Date: Thu, 7 Mar 2013 01:18:14 +0000 (-0500)
Subject: Fix broken build by using ADVANCE_CHAR macro return.
X-Git-Tag: json-c-0.11-20130402~10^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F71%2Fhead;p=thirdparty%2Fjson-c.git

Fix broken build by using ADVANCE_CHAR macro return.

We forget to check or use the return value of the ADVANCE_CHAR macro,
and upon compilation an error is thrown because of its lack of use. This
patch checks to see if the macro was successful, and if not replaces the
offending character with a replacement.
---

diff --git a/json_tokener.c b/json_tokener.c
index afb7bb2b..6d50bc23 100644
--- a/json_tokener.c
+++ b/json_tokener.c
@@ -507,9 +507,13 @@ struct json_object* json_tokener_parse_ex(struct json_tokener *tok,
                       (str[1] == '\\') &&
                       (str[2] == 'u'))
                   {
-	            ADVANCE_CHAR(str, tok);
-	            ADVANCE_CHAR(str, tok);
-
+                /* Advance through the 16 bit surrogate, and move on to the
+                 * next sequence. The next step is to process the following
+                 * characters.
+                 */
+	            if( !ADVANCE_CHAR(str, tok) || !ADVANCE_CHAR(str, tok) ) {
+                    printbuf_memappend_fast(tok->pb, (char*)utf8_replacement_char, 3);
+                }
                     /* Advance to the first char of the next sequence and
                      * continue processing with the next sequence.
                      */