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

Merge pull request #389 from DaveGamble/revert-388-secure_c

Browse Source 
Revert "Replace strcpy with strncpy, sprintf with snprintf"
This commit is contained in:
Alanscut 2019-09-24 10:20:41 +08:00 committed by GitHub
commit 2de7d04aaf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
cJSON.c
View File

@ -95,7 +95,7 @@ CJSON_PUBLIC(char *) cJSON_GetStringValue(cJSON *item) {
CJSON_PUBLIC(const char*) cJSON_Version(void) CJSON_PUBLIC(const char*) cJSON_Version(void)
{ {
static char version[15]; static char version[15];
snprintf(version, sizeof(version), "%i.%i.%i", CJSON_VERSION_MAJOR, CJSON_VERSION_MINOR, CJSON_VERSION_PATCH); sprintf(version, "%i.%i.%i", CJSON_VERSION_MAJOR, CJSON_VERSION_MINOR, CJSON_VERSION_PATCH);
return version; return version;
} }
@ -499,22 +499,22 @@ static cJSON_bool print_number(const cJSON * const item, printbuffer * const out
/* This checks for NaN and Infinity */ /* This checks for NaN and Infinity */
if ((d * 0) != 0) if ((d * 0) != 0)
{ {
length = snprintf((char*)number_buffer, sizeof(number_buffer), "null"); length = sprintf((char*)number_buffer, "null");
} }
else else
{ {
/* Try 15 decimal places of precision to avoid nonsignificant nonzero digits */ /* Try 15 decimal places of precision to avoid nonsignificant nonzero digits */
length = snprintf((char*)number_buffer, sizeof(number_buffer), "%1.15g", d); length = sprintf((char*)number_buffer, "%1.15g", d);
/* Check whether the original double can be recovered */ /* Check whether the original double can be recovered */
if ((sscanf((char*)number_buffer, "%lg", &test) != 1) || ((double)test != d)) if ((sscanf((char*)number_buffer, "%lg", &test) != 1) || ((double)test != d))
{ {
/* If not, print with 17 decimal places of precision */ /* If not, print with 17 decimal places of precision */
length = snprintf((char*)number_buffer, sizeof(number_buffer), "%1.17g", d); length = sprintf((char*)number_buffer, "%1.17g", d);
} }
} }
/* snprintf failed or buffer overrun occurred */ /* sprintf failed or buffer overrun occurred */
if ((length < 0) || (length > (int)(sizeof(number_buffer) - 1))) if ((length < 0) || (length > (int)(sizeof(number_buffer) - 1)))
{ {
return false; return false;
@ -848,16 +848,15 @@ static cJSON_bool print_string_ptr(const unsigned char * const input, printbuffe
return false; return false;
} }
const char quotes[] = "\"\"";
/* empty string */ /* empty string */
if (input == NULL) if (input == NULL)
{ {
output = ensure(output_buffer, sizeof(quotes)); output = ensure(output_buffer, sizeof("\"\""));
if (output == NULL) if (output == NULL)
{ {
return false; return false;
} }
strncpy((char*)output, quotes, output_buffer->length - output_buffer->offset); strcpy((char*)output, "\"\"");
return true; return true;
} }
@ -888,7 +887,7 @@ static cJSON_bool print_string_ptr(const unsigned char * const input, printbuffe
} }
output_length = (size_t)(input_pointer - input) + escape_characters; output_length = (size_t)(input_pointer - input) + escape_characters;
output = ensure(output_buffer, output_length + sizeof(quotes)); output = ensure(output_buffer, output_length + sizeof("\"\""));
if (output == NULL) if (output == NULL)
{ {
return false; return false;
@ -944,7 +943,7 @@ static cJSON_bool print_string_ptr(const unsigned char * const input, printbuffe
break; break;
default: default:
/* escape and print as unicode codepoint */ /* escape and print as unicode codepoint */
snprintf((char*)output_pointer, output_buffer->length - (output_pointer - output_buffer->buffer), "u%04x", *input_pointer); sprintf((char*)output_pointer, "u%04x", *input_pointer);
output_pointer += 4; output_pointer += 4;
break; break;
} }
@ -1287,38 +1286,32 @@ static cJSON_bool print_value(const cJSON * const item, printbuffer * const outp
switch ((item->type) & 0xFF) switch ((item->type) & 0xFF)
{ {
case cJSON_NULL: case cJSON_NULL:
{ output = ensure(output_buffer, 5);
const char buff[] = "null";
output = ensure(output_buffer, sizeof(buff));
if (output == NULL) if (output == NULL)
{ {
return false; return false;
} }
strncpy((char*)output, buff, output_buffer->length - output_buffer->offset); strcpy((char*)output, "null");
return true; return true;
}
case cJSON_False: case cJSON_False:
{ output = ensure(output_buffer, 6);
const char buff[] = "false";
output = ensure(output_buffer, sizeof(buff));
if (output == NULL) if (output == NULL)
{ {
return false; return false;
} }
strncpy((char*)output, buff, output_buffer->length - output_buffer->offset); strcpy((char*)output, "false");
return true; return true;
}
case cJSON_True: case cJSON_True:
{ output = ensure(output_buffer, 5);
const char buff[] = "true";
output = ensure(output_buffer, sizeof(buff));
if (output == NULL) if (output == NULL)
{ {
return false; return false;
} }
strncpy((char*)output, buff, output_buffer->length - output_buffer->offset); strcpy((char*)output, "true");
return true; return true;
}
case cJSON_Number: case cJSON_Number:
return print_number(item, output_buffer); return print_number(item, output_buffer);