diff options
| author | Lloyd Hilaiel <lloyd@hilaiel.com> | 2011-04-20 10:27:46 -0600 |
|---|---|---|
| committer | Lloyd Hilaiel <lloyd@hilaiel.com> | 2011-04-20 10:27:46 -0600 |
| commit | dc206cf75b8489b4cdcc8ff0cdbe94cbcc61a551 (patch) | |
| tree | e9d6f3873dfe530e11009bbf0fa1e858f27d968b /src/yajl_parser.c | |
| parent | 1ecfbc0b3458420feba033cd2c25a4f5e9bac0b4 (diff) | |
| parent | 49116c941312b78ca6768b916fd0d247147f1f47 (diff) | |
| download | yajl-dc206cf75b8489b4cdcc8ff0cdbe94cbcc61a551.tar.gz | |
Merge branch 'master' into 2.x
Diffstat (limited to 'src/yajl_parser.c')
| -rw-r--r-- | src/yajl_parser.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/yajl_parser.c b/src/yajl_parser.c index 59c93f6..e9b9895 100644 --- a/src/yajl_parser.c +++ b/src/yajl_parser.c @@ -111,9 +111,9 @@ yajl_render_error_string(yajl_handle hand, const unsigned char * jsonText, text[i] = 0; { char * newStr = (char *) - YA_MALLOC(&(hand->alloc), (strlen((char *) str) + - strlen((char *) text) + - strlen(arrow) + 1)); + YA_MALLOC(&(hand->alloc), (unsigned int)(strlen((char *) str) + + strlen((char *) text) + + strlen(arrow) + 1)); newStr[0] = 0; strcat((char *) newStr, (char *) str); strcat((char *) newStr, text); |