]> git.feebdaed.xyz Git - 0xmirror/cJSON.git/commitdiff
fix encode_string_as_pointer
authorAlanscut <wp_scut@163.com>
Wed, 18 Mar 2020 08:04:58 +0000 (16:04 +0800)
committerAlanscut <wp_scut@163.com>
Wed, 18 Mar 2020 08:04:58 +0000 (16:04 +0800)
cJSON_Utils.c
tests/old_utils_tests.c

index 79e052be58a90b18eaecab2a1538ea32f10f7b73..3a535b1d3f938160931dc3869b75e8eced5e4170 100644 (file)
@@ -173,13 +173,14 @@ static void encode_string_as_pointer(unsigned char *destination, const unsigned
     {
         if (source[0] == '/')
         {
+            destination[0] = '~';
             destination[1] = '1';
             destination++;
         }
         else if (source[0] == '~')
         {
             destination[0] = '~';
-            destination[1] = '1';
+            destination[1] = '0';
             destination++;
         }
         else
index 08da6a6dcdb72d6d8a9a4529089c99925b2d6223..690dbb583bc29f174df565c7ba5759e64d2c882c 100644 (file)
@@ -90,6 +90,10 @@ static void misc_tests(void)
     /* Misc tests */
     int numbers[10] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
     cJSON *object = NULL;
+    cJSON *object1 = NULL;
+    cJSON *object2 = NULL;
+    cJSON *object3 = NULL;
+    cJSON *object4 = NULL;
     cJSON *nums = NULL;
     cJSON *num6 = NULL;
     char *pointer = NULL;
@@ -112,7 +116,23 @@ static void misc_tests(void)
     TEST_ASSERT_EQUAL_STRING("", pointer);
     free(pointer);
 
+    object1 = cJSON_CreateObject();
+    object2 = cJSON_CreateString("m~n");
+    cJSON_AddItemToObject(object1, "m~n", object2);
+    pointer = cJSONUtils_FindPointerFromObjectTo(object1, object2);
+    TEST_ASSERT_EQUAL_STRING("/m~0n",pointer);
+    free(pointer);
+
+    object3 = cJSON_CreateObject();
+    object4 = cJSON_CreateString("m/n");
+    cJSON_AddItemToObject(object3, "m/n", object4);
+    pointer = cJSONUtils_FindPointerFromObjectTo(object3, object4);
+    TEST_ASSERT_EQUAL_STRING("/m~1n",pointer);
+    free(pointer);
+
     cJSON_Delete(object);
+    cJSON_Delete(object1);
+    cJSON_Delete(object3);
 }
 
 static void sort_tests(void)