mirror/cJSON
1
0
Fork 0
mirror of https://github.com/DaveGamble/cJSON.git synced 2023-08-10 21:13:26 +03:00
Code Issues Projects Releases Wiki Activity

Compiler flag -Wconversion

Browse Source 
Makes type conversions explicit, if they alter a value
This commit is contained in:
Max Bruckner 2017-02-03 18:34:37 +01:00
parent 41e2837df1
commit 3d3bfc6a4d
5 changed files with 81 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -15,7 +15,7 @@ set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT
option(ENABLE_CUSTOM_COMPILER_FLAGS "Enables custom compiler flags for Clang and GCC" ON) option(ENABLE_CUSTOM_COMPILER_FLAGS "Enables custom compiler flags for Clang and GCC" ON)
if (ENABLE_CUSTOM_COMPILER_FLAGS) if (ENABLE_CUSTOM_COMPILER_FLAGS)
if(("${CMAKE_C_COMPILER_ID}" MATCHES "GNU") OR ("${CMAKE_C_COMPILER_ID}" MATCHES "Clang")) if(("${CMAKE_C_COMPILER_ID}" MATCHES "GNU") OR ("${CMAKE_C_COMPILER_ID}" MATCHES "Clang"))
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c89 -pedantic -Wall -Wextra -Werror -Wstrict-prototypes -Wwrite-strings -Wshadow -Winit-self -Wcast-align -Wformat=2 -Wmissing-prototypes -Wstrict-overflow=2 -Wcast-qual -Wc++-compat -Wundef -Wswitch-default") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c89 -pedantic -Wall -Wextra -Werror -Wstrict-prototypes -Wwrite-strings -Wshadow -Winit-self -Wcast-align -Wformat=2 -Wmissing-prototypes -Wstrict-overflow=2 -Wcast-qual -Wc++-compat -Wundef -Wswitch-default -Wconversion")
endif() endif()
endif() endif()

2
Makefile
View File

@ -23,7 +23,7 @@ INSTALL_LIBRARY_PATH = $(DESTDIR)$(PREFIX)/$(LIBRARY_PATH)
INSTALL ?= cp -a INSTALL ?= cp -a
R_CFLAGS = -fPIC -std=c89 -pedantic -Wall -Werror -Wstrict-prototypes -Wwrite-strings -Wshadow -Winit-self -Wcast-align -Wformat=2 -Wmissing-prototypes -Wstrict-overflow=2 -Wcast-qual -Wc++-compat -Wundef -Wswitch-default $(CFLAGS) R_CFLAGS = -fPIC -std=c89 -pedantic -Wall -Werror -Wstrict-prototypes -Wwrite-strings -Wshadow -Winit-self -Wcast-align -Wformat=2 -Wmissing-prototypes -Wstrict-overflow=2 -Wcast-qual -Wc++-compat -Wundef -Wswitch-default -Wconversion $(CFLAGS)
uname := $(shell sh -c 'uname -s 2>/dev/null || echo false') uname := $(shell sh -c 'uname -s 2>/dev/null || echo false')

102
cJSON.c
View File

@ -298,7 +298,7 @@ static unsigned char* ensure(printbuffer *p, size_t needed)
return NULL; return NULL;
} }
newsize = pow2gt(needed); newsize = (size_t) pow2gt((int)needed);
newbuffer = (unsigned char*)cJSON_malloc(newsize); newbuffer = (unsigned char*)cJSON_malloc(newsize);
if (!newbuffer) if (!newbuffer)
{ {
@ -410,19 +410,20 @@ static unsigned char *print_number(const cJSON *item, printbuffer *p)
/* parse 4 digit hexadecimal number */ /* parse 4 digit hexadecimal number */
static unsigned parse_hex4(const unsigned char *str) static unsigned parse_hex4(const unsigned char *str)
{ {
unsigned h = 0; unsigned int h = 0;
/* first digit */ /* first digit */
if ((*str >= '0') && (*str <= '9')) if ((*str >= '0') && (*str <= '9'))
{ {
h += (*str) - '0'; h += (unsigned int) (*str) - '0';
} }
else if ((*str >= 'A') && (*str <= 'F')) else if ((*str >= 'A') && (*str <= 'F'))
{ {
h += 10 + (*str) - 'A'; h += (unsigned int) 10 + (*str) - 'A';
} }
else if ((*str >= 'a') && (*str <= 'f')) else if ((*str >= 'a') && (*str <= 'f'))
{ {
h += 10 + (*str) - 'a'; h += (unsigned int) 10 + (*str) - 'a';
} }
else /* invalid */ else /* invalid */
{ {
@ -435,15 +436,15 @@ static unsigned parse_hex4(const unsigned char *str)
str++; str++;
if ((*str >= '0') && (*str <= '9')) if ((*str >= '0') && (*str <= '9'))
{ {
h += (*str) - '0'; h += (unsigned int) (*str) - '0';
} }
else if ((*str >= 'A') && (*str <= 'F')) else if ((*str >= 'A') && (*str <= 'F'))
{ {
h += 10 + (*str) - 'A'; h += (unsigned int) 10 + (*str) - 'A';
} }
else if ((*str >= 'a') && (*str <= 'f')) else if ((*str >= 'a') && (*str <= 'f'))
{ {
h += 10 + (*str) - 'a'; h += (unsigned int) 10 + (*str) - 'a';
} }
else /* invalid */ else /* invalid */
{ {
@ -455,15 +456,15 @@ static unsigned parse_hex4(const unsigned char *str)
str++; str++;
if ((*str >= '0') && (*str <= '9')) if ((*str >= '0') && (*str <= '9'))
{ {
h += (*str) - '0'; h += (unsigned int) (*str) - '0';
} }
else if ((*str >= 'A') && (*str <= 'F')) else if ((*str >= 'A') && (*str <= 'F'))
{ {
h += 10 + (*str) - 'A'; h += (unsigned int) 10 + (*str) - 'A';
} }
else if ((*str >= 'a') && (*str <= 'f')) else if ((*str >= 'a') && (*str <= 'f'))
{ {
h += 10 + (*str) - 'a'; h += (unsigned int) 10 + (*str) - 'a';
} }
else /* invalid */ else /* invalid */
{ {
@ -475,15 +476,15 @@ static unsigned parse_hex4(const unsigned char *str)
str++; str++;
if ((*str >= '0') && (*str <= '9')) if ((*str >= '0') && (*str <= '9'))
{ {
h += (*str) - '0'; h += (unsigned int) (*str) - '0';
} }
else if ((*str >= 'A') && (*str <= 'F')) else if ((*str >= 'A') && (*str <= 'F'))
{ {
h += 10 + (*str) - 'A'; h += (unsigned int) 10 + (*str) - 'A';
} }
else if ((*str >= 'a') && (*str <= 'f')) else if ((*str >= 'a') && (*str <= 'f'))
{ {
h += 10 + (*str) - 'a'; h += (unsigned int) 10 + (*str) - 'a';
} }
else /* invalid */ else /* invalid */
{ {
@ -650,20 +651,20 @@ static const unsigned char *parse_string(cJSON *item, const unsigned char *str,
switch (len) { switch (len) {
case 4: case 4:
/* 10xxxxxx */ /* 10xxxxxx */
*--ptr2 = ((uc | 0x80) & 0xBF); *--ptr2 = (unsigned char)((uc | 0x80) & 0xBF);
uc >>= 6; uc >>= 6;
case 3: case 3:
/* 10xxxxxx */ /* 10xxxxxx */
*--ptr2 = ((uc | 0x80) & 0xBF); *--ptr2 = (unsigned char)((uc | 0x80) & 0xBF);
uc >>= 6; uc >>= 6;
case 2: case 2:
/* 10xxxxxx */ /* 10xxxxxx */
*--ptr2 = ((uc | 0x80) & 0xBF); *--ptr2 = (unsigned char)((uc | 0x80) & 0xBF);
uc >>= 6; uc >>= 6;
case 1: case 1:
/* depending on the length in bytes this determines the /* depending on the length in bytes this determines the
* encoding ofthe first UTF8 byte */ * encoding ofthe first UTF8 byte */
*--ptr2 = (uc | firstByteMark[len]); *--ptr2 = (unsigned char)((uc | firstByteMark[len]) & 0xFF);
default: default:
*ep = str; *ep = str;
return NULL; return NULL;
@ -728,7 +729,7 @@ static unsigned char *print_string_ptr(const unsigned char *str, printbuffer *p)
/* no characters have to be escaped */ /* no characters have to be escaped */
if (!flag) if (!flag)
{ {
len = ptr - str; len = (size_t)(ptr - str);
if (p) if (p)
{ {
out = ensure(p, len + 3); out = ensure(p, len + 3);
@ -917,12 +918,19 @@ char *cJSON_PrintUnformatted(const cJSON *item)
char *cJSON_PrintBuffered(const cJSON *item, int prebuffer, cjbool fmt) char *cJSON_PrintBuffered(const cJSON *item, int prebuffer, cjbool fmt)
{ {
printbuffer p; printbuffer p;
p.buffer = (unsigned char*)cJSON_malloc(prebuffer);
if (prebuffer < 0)
{
return false;
}
p.buffer = (unsigned char*)cJSON_malloc((size_t)prebuffer);
if (!p.buffer) if (!p.buffer)
{ {
return NULL; return NULL;
} }
p.length = prebuffer;
p.length = (size_t)prebuffer;
p.offset = 0; p.offset = 0;
p.noalloc = false; p.noalloc = false;
@ -932,11 +940,17 @@ char *cJSON_PrintBuffered(const cJSON *item, int prebuffer, cjbool fmt)
int cJSON_PrintPreallocated(cJSON *item, char *buf, const int len, const cjbool fmt) int cJSON_PrintPreallocated(cJSON *item, char *buf, const int len, const cjbool fmt)
{ {
printbuffer p; printbuffer p;
if (len < 0)
{
return false;
}
p.buffer = (unsigned char*)buf; p.buffer = (unsigned char*)buf;
p.length = len; p.length = (size_t)len;
p.offset = 0; p.offset = 0;
p.noalloc = true; p.noalloc = true;
return print_value(item,0,fmt,&p) != NULL; return print_value(item, 0, fmt, &p) != NULL;
} }
/* Parser core - when encountering text, process appropriately. */ /* Parser core - when encountering text, process appropriately. */
@ -1546,7 +1560,7 @@ static unsigned char *print_object(const cJSON *item, size_t depth, cjbool fmt,
p->offset = update(p); p->offset = update(p);
/* print comma if not last */ /* print comma if not last */
len = (fmt ? 1 : 0) + (child->next ? 1 : 0); len = (size_t) (fmt ? 1 : 0) + (child->next ? 1 : 0);
ptr = ensure(p, len + 1); ptr = ensure(p, len + 1);
if (!ptr) if (!ptr)
{ {
@ -1709,7 +1723,7 @@ static unsigned char *print_object(const cJSON *item, size_t depth, cjbool fmt,
} }
/* Get Array size/item / object item. */ /* Get Array size/item / object item. */
int cJSON_GetArraySize(const cJSON *array) int cJSON_GetArraySize(const cJSON *array)
{ {
cJSON *c = array->child; cJSON *c = array->child;
size_t i = 0; size_t i = 0;
@ -1721,7 +1735,7 @@ int cJSON_GetArraySize(const cJSON *array)
/* FIXME: Can overflow here. Cannot be fixed without breaking the API */ /* FIXME: Can overflow here. Cannot be fixed without breaking the API */
return i; return (int)i;
} }
cJSON *cJSON_GetArrayItem(const cJSON *array, int item) cJSON *cJSON_GetArrayItem(const cJSON *array, int item)
@ -1843,7 +1857,7 @@ void cJSON_AddItemReferenceToObject(cJSON *object, const char *string, cJSON *it
cJSON_AddItemToObject(object, string, create_reference(item)); cJSON_AddItemToObject(object, string, create_reference(item));
} }
cJSON *cJSON_DetachItemFromArray(cJSON *array, int which) static cJSON *DetachItemFromArray(cJSON *array, size_t which)
{ {
cJSON *c = array->child; cJSON *c = array->child;
while (c && (which > 0)) while (c && (which > 0))
@ -1874,6 +1888,15 @@ cJSON *cJSON_DetachItemFromArray(cJSON *array, int which)
return c; return c;
} }
cJSON *cJSON_DetachItemFromArray(cJSON *array, int which)
{
if (which < 0)
{
return NULL;
}
return DetachItemFromArray(array, (size_t)which);
}
void cJSON_DeleteItemFromArray(cJSON *array, int which) void cJSON_DeleteItemFromArray(cJSON *array, int which)
{ {
@ -1891,7 +1914,7 @@ cJSON *cJSON_DetachItemFromObject(cJSON *object, const char *string)
} }
if (c) if (c)
{ {
return cJSON_DetachItemFromArray(object, i); return DetachItemFromArray(object, i);
} }
return NULL; return NULL;
@ -1929,7 +1952,7 @@ void cJSON_InsertItemInArray(cJSON *array, int which, cJSON *newitem)
} }
} }
void cJSON_ReplaceItemInArray(cJSON *array, int which, cJSON *newitem) static void ReplaceItemInArray(cJSON *array, size_t which, cJSON *newitem)
{ {
cJSON *c = array->child; cJSON *c = array->child;
while (c && (which > 0)) while (c && (which > 0))
@ -1958,6 +1981,15 @@ void cJSON_ReplaceItemInArray(cJSON *array, int which, cJSON *newitem)
c->next = c->prev = NULL; c->next = c->prev = NULL;
cJSON_Delete(c); cJSON_Delete(c);
} }
void cJSON_ReplaceItemInArray(cJSON *array, int which, cJSON *newitem)
{
if (which < 0)
{
return;
}
ReplaceItemInArray(array, (size_t)which, newitem);
}
void cJSON_ReplaceItemInObject(cJSON *object, const char *string, cJSON *newitem) void cJSON_ReplaceItemInObject(cJSON *object, const char *string, cJSON *newitem)
{ {
@ -1977,7 +2009,7 @@ void cJSON_ReplaceItemInObject(cJSON *object, const char *string, cJSON *newitem
} }
newitem->string = (char*)cJSON_strdup((const unsigned char*)string); newitem->string = (char*)cJSON_strdup((const unsigned char*)string);
cJSON_ReplaceItemInArray(object, i, newitem); ReplaceItemInArray(object, i, newitem);
} }
} }
@ -2368,21 +2400,21 @@ void cJSON_Minify(char *json)
else if (*json == '\"') else if (*json == '\"')
{ {
/* string literals, which are \" sensitive. */ /* string literals, which are \" sensitive. */
*into++ = *json++; *into++ = (unsigned char)*json++;
while (*json && (*json != '\"')) while (*json && (*json != '\"'))
{ {
if (*json == '\\') if (*json == '\\')
{ {
*into++=*json++; *into++ = (unsigned char)*json++;
} }
*into++ = *json++; *into++ = (unsigned char)*json++;
} }
*into++ = *json++; *into++ = (unsigned char)*json++;
} }
else else
{ {
/* All other characters. */ /* All other characters. */
*into++ = *json++; *into++ = (unsigned char)*json++;
} }
} }

10
cJSON_Utils.c
View File

@ -2,6 +2,8 @@
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <limits.h>
#include "cJSON_Utils.h" #include "cJSON_Utils.h"
static unsigned char* cJSONUtils_strdup(const unsigned char* str) static unsigned char* cJSONUtils_strdup(const unsigned char* str)
@ -172,14 +174,18 @@ cJSON *cJSONUtils_GetPointer(cJSON *object, const char *pointer)
/* parse array index */ /* parse array index */
while ((*pointer >= '0') && (*pointer <= '9')) while ((*pointer >= '0') && (*pointer <= '9'))
{ {
which = (10 * which) + (*pointer++ - '0'); which = (10 * which) + (size_t)(*pointer++ - '0');
} }
if (*pointer && (*pointer != '/')) if (*pointer && (*pointer != '/'))
{ {
/* not end of string or new path token */ /* not end of string or new path token */
return NULL; return NULL;
} }
object = cJSON_GetArrayItem(object, which); if (which > INT_MAX)
{
return NULL;
}
object = cJSON_GetArrayItem(object, (int)which);
} }
else if ((object->type & 0xFF) == cJSON_Object) else if ((object->type & 0xFF) == cJSON_Object)
{ {

8
test.c
View File

@ -97,8 +97,8 @@ static int print_preallocated(cJSON *root)
char *out = NULL; char *out = NULL;
char *buf = NULL; char *buf = NULL;
char *buf_fail = NULL; char *buf_fail = NULL;
int len = 0; size_t len = 0;
int len_fail = 0; size_t len_fail = 0;
/* formatted print */ /* formatted print */
out = cJSON_Print(root); out = cJSON_Print(root);
@ -123,7 +123,7 @@ static int print_preallocated(cJSON *root)
} }
/* Print to buffer */ /* Print to buffer */
if (!cJSON_PrintPreallocated(root, buf, len, 1)) { if (!cJSON_PrintPreallocated(root, buf, (int)len, 1)) {
printf("cJSON_PrintPreallocated failed!\n"); printf("cJSON_PrintPreallocated failed!\n");
if (strcmp(out, buf) != 0) { if (strcmp(out, buf) != 0) {
printf("cJSON_PrintPreallocated not the same as cJSON_Print!\n"); printf("cJSON_PrintPreallocated not the same as cJSON_Print!\n");
@ -140,7 +140,7 @@ static int print_preallocated(cJSON *root)
printf("%s\n", buf); printf("%s\n", buf);
/* force it to fail */ /* force it to fail */
if (cJSON_PrintPreallocated(root, buf_fail, len_fail, 1)) { if (cJSON_PrintPreallocated(root, buf_fail, (int)len_fail, 1)) {
printf("cJSON_PrintPreallocated failed to show error with insufficient memory!\n"); printf("cJSON_PrintPreallocated failed to show error with insufficient memory!\n");
printf("cJSON_Print result:\n%s\n", out); printf("cJSON_Print result:\n%s\n", out);
printf("cJSON_PrintPreallocated result:\n%s\n", buf_fail); printf("cJSON_PrintPreallocated result:\n%s\n", buf_fail);