From 62206e3d436f82b4b7ea6b241845e5baf77c327d Mon Sep 17 00:00:00 2001 From: Jeff Lenk Date: Tue, 24 Aug 2010 08:55:00 -0500 Subject: [PATCH] FSBUILD-296 Fix VS2008 code analysis build --- libs/esl/src/esl_json.c | 2 +- src/switch_json.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/esl/src/esl_json.c b/libs/esl/src/esl_json.c index 5a994ae062..2926a3230b 100644 --- a/libs/esl/src/esl_json.c +++ b/libs/esl/src/esl_json.c @@ -163,7 +163,7 @@ static const char *parse_string(cJSON *item,const char *str) case 'r': *ptr2++='\r'; break; case 't': *ptr2++='\t'; break; case 'u': // transcode utf16 to utf8. DOES NOT SUPPORT SURROGATE PAIRS CORRECTLY. - sscanf(ptr+1,"%4x",&uc); // get the unicode char. + if (sscanf(ptr+1,"%4x",&uc) < 1) break; // get the unicode char. len=3;if (uc<0x80) len=1;else if (uc<0x800) len=2;ptr2+=len; switch (len) { diff --git a/src/switch_json.c b/src/switch_json.c index 814f69644a..e0e27ba70f 100644 --- a/src/switch_json.c +++ b/src/switch_json.c @@ -162,7 +162,7 @@ static const char *parse_string(cJSON *item,const char *str) case 'r': *ptr2++='\r'; break; case 't': *ptr2++='\t'; break; case 'u': // transcode utf16 to utf8. DOES NOT SUPPORT SURROGATE PAIRS CORRECTLY. - sscanf(ptr+1,"%4x",&uc); // get the unicode char. + if (sscanf(ptr+1,"%4x",&uc) < 1) break; // get the unicode char. len=3;if (uc<0x80) len=1;else if (uc<0x800) len=2;ptr2+=len; switch (len) {