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

Replace strcpy with memcpy and remove magic numbers for string sizes

Browse Source
This commit is contained in:
Max Bruckner 2018-08-03 07:39:17 +02:00
parent 054b4d146d
commit 0b20df9ecf
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
cJSON.c
View File

@ -836,12 +836,13 @@ static cJSON_bool print_string_ptr(const unsigned char * const input, printbuffe
/* empty string */ /* empty string */
if (input == NULL) if (input == NULL)
{ {
output = ensure(output_buffer, sizeof("\"\"")); const char quotes[] = "\"\"";
output = ensure(output_buffer, sizeof(quotes));
if (output == NULL) if (output == NULL)
{ {
return false; return false;
} }
strcpy((char*)output, "\"\""); memcpy(output, quotes, sizeof(quotes));
return true; return true;
} }
@ -1297,31 +1298,40 @@ 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 null_string[] = "null";
output = ensure(output_buffer, sizeof(null_string));
if (output == NULL) if (output == NULL)
{ {
return false; return false;
} }
strcpy((char*)output, "null"); memcpy(output, null_string, sizeof(null_string));
return true; return true;
}
case cJSON_False: case cJSON_False:
output = ensure(output_buffer, 6); {
const char false_string[] = "false";
output = ensure(output_buffer, sizeof(false_string));
if (output == NULL) if (output == NULL)
{ {
return false; return false;
} }
strcpy((char*)output, "false"); memcpy(output, false_string, sizeof(false_string));
return true; return true;
}
case cJSON_True: case cJSON_True:
output = ensure(output_buffer, 5); {
const char true_string[] = "true";
output = ensure(output_buffer, sizeof(true_string));
if (output == NULL) if (output == NULL)
{ {
return false; return false;
} }
strcpy((char*)output, "true"); memcpy(output, true_string, sizeof(true_string));
return true; return true;
}
case cJSON_Number: case cJSON_Number:
return print_number(item, output_buffer); return print_number(item, output_buffer);