mirror of
https://github.com/DaveGamble/cJSON.git
synced 2026-08-13 04:57:45 +00:00
fix: prevent NULL pointer dereference in cJSON_SetNumberHelper (#991)
Add NULL check at the beginning of cJSON_SetNumberHelper to prevent segmentation fault when called with NULL object pointer. The function now returns NAN (Not-a-Number) when object is NULL, consistent with error handling patterns in other cJSON functions. This fixes a Denial of Service vulnerability (CWE-476) where an attacker could crash applications using the cJSON library by triggering this function with a NULL pointer. Changes: - cJSON.c: Add NULL check in cJSON_SetNumberHelper - tests/misc_tests.c: Add test case and math.h include Security: Fixes NULL pointer dereference vulnerability
This commit is contained in:
@@ -410,6 +410,11 @@ loop_end:
|
|||||||
/* don't ask me, but the original cJSON_SetNumberValue returns an integer or double */
|
/* don't ask me, but the original cJSON_SetNumberValue returns an integer or double */
|
||||||
CJSON_PUBLIC(double) cJSON_SetNumberHelper(cJSON *object, double number)
|
CJSON_PUBLIC(double) cJSON_SetNumberHelper(cJSON *object, double number)
|
||||||
{
|
{
|
||||||
|
if (object == NULL)
|
||||||
|
{
|
||||||
|
return (double)NAN;
|
||||||
|
}
|
||||||
|
|
||||||
if (number >= INT_MAX)
|
if (number >= INT_MAX)
|
||||||
{
|
{
|
||||||
object->valueint = INT_MAX;
|
object->valueint = INT_MAX;
|
||||||
|
|||||||
+3
-2
@@ -23,6 +23,7 @@
|
|||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
#include <math.h>
|
||||||
|
|
||||||
#include "unity/examples/unity_config.h"
|
#include "unity/examples/unity_config.h"
|
||||||
#include "unity/src/unity.h"
|
#include "unity/src/unity.h"
|
||||||
@@ -478,8 +479,8 @@ static void cjson_functions_should_not_crash_with_null_pointers(void)
|
|||||||
TEST_ASSERT_NULL(cJSON_SetValuestring(corruptedString, "test"));
|
TEST_ASSERT_NULL(cJSON_SetValuestring(corruptedString, "test"));
|
||||||
TEST_ASSERT_NULL(cJSON_SetValuestring(item, NULL));
|
TEST_ASSERT_NULL(cJSON_SetValuestring(item, NULL));
|
||||||
cJSON_Minify(NULL);
|
cJSON_Minify(NULL);
|
||||||
/* skipped because it is only used via a macro that checks for NULL */
|
/* cJSON_SetNumberHelper should handle NULL gracefully */
|
||||||
/* cJSON_SetNumberHelper(NULL, 0); */
|
TEST_ASSERT_TRUE(isnan(cJSON_SetNumberHelper(NULL, 0)));
|
||||||
|
|
||||||
/* restore corrupted item2 to delete it */
|
/* restore corrupted item2 to delete it */
|
||||||
item2->prev = originalPrev;
|
item2->prev = originalPrev;
|
||||||
|
|||||||
Reference in New Issue
Block a user