Merge 860ed3a77c24697c3a7d796f1e9c10cedccda217 into cb8693b058ba302f4829ec6d03f609ac6f848546

This commit is contained in:
ZhaoYandong00 2023-07-06 08:28:07 +08:00 committed by GitHub
commit 5ffec39d1a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -405,10 +405,13 @@ CJSON_PUBLIC(char*) cJSON_SetValuestring(cJSON *object, const char *valuestring)
{ {
return NULL; return NULL;
} }
if (strlen(valuestring) <= strlen(object->valuestring)) if (object->valuestring != NULL)
{ {
strcpy(object->valuestring, valuestring); if (strlen(valuestring) <= strlen(object->valuestring))
return object->valuestring; {
strcpy(object->valuestring, valuestring);
return object->valuestring;
}
} }
copy = (char*) cJSON_strdup((const unsigned char*)valuestring, &global_hooks); copy = (char*) cJSON_strdup((const unsigned char*)valuestring, &global_hooks);
if (copy == NULL) if (copy == NULL)