From 18a7cf98c9be96b647f4d6c02ed8f8ac3d1c1569 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=B7=8D?= Date: Wed, 2 Apr 2025 15:35:08 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0cjson=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 李巍 --- commondependency/BUILD.gn | 2 + device_manager.gni | 1 + ext/pin_auth/BUILD.gn | 3 +- interfaces/cj/kits/BUILD.gn | 7 +- interfaces/inner_kits/native_cpp/BUILD.gn | 14 +- interfaces/kits/js/BUILD.gn | 7 +- interfaces/kits/js4.0/BUILD.gn | 7 +- .../mini_tools_kits/native_cpp/BUILD.gn | 1 + json/BUILD.gn | 107 + json/include/dm_cJSON.h | 339 ++ {common => json}/include/json_object.h | 385 +- json/src/dm_cJSON.cpp | 3484 +++++++++++++++++ {common => json}/src/json_object.cpp | 0 radar/BUILD.gn | 19 +- radar/src/dm_radar_helper.cpp | 3 +- radar/src/lite/dm_radar_helper.cpp | 2 +- services/implementation/BUILD.gn | 9 +- .../include/i18n/dm_language_manager.h | 4 +- .../hichain/hichain_auth_connector.cpp | 2 +- .../src/i18n/dm_language_manager.cpp | 2 +- services/service/BUILD.gn | 14 +- .../relationshipsyncmgr/dm_transport_msg.h | 3 +- .../relationship_sync_mgr.h | 3 +- .../include/softbus/softbus_listener.h | 3 +- .../service/src/device_manager_service.cpp | 4 +- .../src/device_manager_service_listener.cpp | 3 +- services/softbuscache/BUILD.gn | 5 +- .../authenticatedevice_fuzzer/BUILD.gn | 1 + .../authenticatedeviceservice_fuzzer/BUILD.gn | 2 +- .../BUILD.gn | 2 +- .../dmauthmanager_fuzzer/BUILD.gn | 1 + .../dmcommoneventmanager_fuzzer/BUILD.gn | 1 + .../dmcredentialimpl_fuzzer/BUILD.gn | 1 + .../dmdiscoverymanager_fuzzer/BUILD.gn | 1 + .../generateencrypteduuid_fuzzer/BUILD.gn | 1 + .../getdeviceinfo_fuzzer/BUILD.gn | 1 + .../hichainconnector_fuzzer/BUILD.gn | 2 + .../ondatareceived_fuzzer/BUILD.gn | 1 + test/commonfuzztest/onerror_fuzzer/BUILD.gn | 1 + test/commonfuzztest/onfinish_fuzzer/BUILD.gn | 1 + test/commonfuzztest/onrequest_fuzzer/BUILD.gn | 1 + test/commonfuzztest/pinauth_fuzzer/BUILD.gn | 1 + test/commonfuzztest/pinauthui_fuzzer/BUILD.gn | 1 + test/commonfuzztest/pinholder_fuzzer/BUILD.gn | 1 + .../cryptomgr_fuzzer/BUILD.gn | 1 + .../devicediscovery_fuzzer/BUILD.gn | 1 + .../devicelist_fuzzer/BUILD.gn | 1 + .../devicelistrefresh_fuzzer/BUILD.gn | 1 + .../devicemanagernotify_fuzzer/BUILD.gn | 1 + .../devicemanagerservice_fuzzer/BUILD.gn | 2 +- .../devicenamemanager_fuzzer/BUILD.gn | 1 + .../deviceprofileconnector_fuzzer/BUILD.gn | 1 + .../devicepublish_fuzzer/BUILD.gn | 1 + .../dmadaptermanager_fuzzer/BUILD.gn | 1 + .../dmcommtool_fuzzer/BUILD.gn | 2 +- .../dmtransport_fuzzer/BUILD.gn | 2 +- .../dmtransportmsg_fuzzer/BUILD.gn | 4 +- .../dm_transport_msg_fuzzer.cpp | 4 +- .../dpinitcallback_fuzzer/BUILD.gn | 2 + .../getlocaldeviceinfo_fuzzer/BUILD.gn | 1 + .../BUILD.gn | 2 +- .../getudidbynetworkid_fuzzer/BUILD.gn | 1 + .../getuuidbynetworkid_fuzzer/BUILD.gn | 1 + .../initdevicemanager_fuzzer/BUILD.gn | 1 + .../ipcclientmanager_fuzzer/BUILD.gn | 1 + .../ipccmdregister_fuzzer/BUILD.gn | 1 + .../ipcserverclientproxy_fuzzer/BUILD.gn | 1 + .../ipcserverlistener_fuzzer/BUILD.gn | 1 + .../ipcserverstub_fuzzer/BUILD.gn | 1 + .../notifyevent_fuzzer/BUILD.gn | 1 + .../BUILD.gn | 1 + .../registerdevstatecallback_fuzzer/BUILD.gn | 1 + .../setuseroperation_fuzzer/BUILD.gn | 1 + .../shiftlnngeardeviceservice_fuzzer/BUILD.gn | 2 +- .../unauthenticatedevice_fuzzer/BUILD.gn | 1 + .../BUILD.gn | 1 + .../closedmradarhelperobj_fuzzer/BUILD.gn | 1 + .../onbytesreceived_fuzzer/BUILD.gn | 1 + .../onparameterchgcallback_fuzzer/BUILD.gn | 1 + .../onsessionopened_fuzzer/BUILD.gn | 1 + .../onsoftbusdevicefound_fuzzer/BUILD.gn | 2 +- .../BUILD.gn | 2 +- .../onsoftbusdeviceoffline_fuzzer/BUILD.gn | 2 +- .../onsoftbusdeviceonline_fuzzer/BUILD.gn | 2 +- .../BUILD.gn | 2 +- .../publishsoftbuslnn_fuzzer/BUILD.gn | 2 +- .../refreshsoftbuslnn_fuzzer/BUILD.gn | 2 +- .../softbusconnector_fuzzer/BUILD.gn | 1 + .../softbusconnectorcommon_fuzzer/BUILD.gn | 1 + .../softbusconnectorpublish_fuzzer/BUILD.gn | 1 + .../softbusconnectorregister_fuzzer/BUILD.gn | 1 + .../softbusconnectorstate_fuzzer/BUILD.gn | 1 + .../softbusconnectorstatic_fuzzer/BUILD.gn | 1 + .../softbuslistener_fuzzer/BUILD.gn | 3 +- .../BUILD.gn | 2 +- .../softbussession_fuzzer/BUILD.gn | 1 + .../softbussessionobject_fuzzer/BUILD.gn | 1 + .../stoprefreshsoftbuslnn_fuzzer/BUILD.gn | 2 +- test/unittest/BUILD.gn | 35 +- test/unittest/UTTest_json_object.cpp | 35 +- utils/BUILD.gn | 21 +- utils/src/kvadapter/dm_kv_info.cpp | 3 +- utils/src/kvadapter/kv_adapter.cpp | 3 +- 103 files changed, 4331 insertions(+), 296 deletions(-) create mode 100644 json/BUILD.gn create mode 100644 json/include/dm_cJSON.h rename {common => json}/include/json_object.h (97%) create mode 100644 json/src/dm_cJSON.cpp rename {common => json}/src/json_object.cpp (100%) diff --git a/commondependency/BUILD.gn b/commondependency/BUILD.gn index a0ef0841c..7edee46dc 100644 --- a/commondependency/BUILD.gn +++ b/commondependency/BUILD.gn @@ -68,6 +68,7 @@ ohos_shared_library("devicemanagerdependency") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"devicemanagerdependency\"", "LOG_DOMAIN=0xD004112", + "__CJSON_USE_INT64", ] deps = [ @@ -136,6 +137,7 @@ ohos_shared_library("devicemanagerdependencytest") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"devicemanagerdependency\"", "LOG_DOMAIN=0xD004112", + "__CJSON_USE_INT64", ] deps = [ diff --git a/device_manager.gni b/device_manager.gni index d197e5b76..629af75c8 100644 --- a/device_manager.gni +++ b/device_manager.gni @@ -29,6 +29,7 @@ interfaces_path = "//foundation/communication/ipc/interfaces/innerkits" utils_lite_path = "//commonlibrary/utils_lite" c_utils_path = "//commonlibrary/c_utils/base/" fuzz_test_output_path = "device_manager/device_manager" +json_path = "${devicemanager_path}/json" #----------------------compilation options--------------------------# dm_ldflags = [ "-lpthread" ] diff --git a/ext/pin_auth/BUILD.gn b/ext/pin_auth/BUILD.gn index 93ef54845..47506d0b1 100644 --- a/ext/pin_auth/BUILD.gn +++ b/ext/pin_auth/BUILD.gn @@ -74,6 +74,7 @@ ohos_shared_library("devicemanagerext_pin_auth") { deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", + "${json_path}:devicemanagerjson", "${servicesimpl_path}:devicemanagerserviceimpl", ] @@ -81,7 +82,6 @@ ohos_shared_library("devicemanagerext_pin_auth") { "ability_base:session_info", "ability_base:want", "ability_runtime:ability_manager", - "cJSON:cjson", "c_utils:utils", "device_auth:deviceauth_sdk", "device_info_manager:distributed_device_profile_common", @@ -101,6 +101,7 @@ ohos_shared_library("devicemanagerext_pin_auth") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"devicemanagerext\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] subsystem_name = "distributedhardware" diff --git a/interfaces/cj/kits/BUILD.gn b/interfaces/cj/kits/BUILD.gn index 5a19c440b..5556bac6a 100644 --- a/interfaces/cj/kits/BUILD.gn +++ b/interfaces/cj/kits/BUILD.gn @@ -56,18 +56,21 @@ ohos_shared_library("cj_distributed_device_manager_ffi") { "src/device_manager_utils.cpp", ] - deps = [ "${innerkits_path}/native_cpp:devicemanagersdk" ] + deps = [ + "${innerkits_path}/native_cpp:devicemanagersdk", + "${json_path}:devicemanagerjson", + ] defines = [ "HI_LOG_ENABLE", "DH_LOG_TAG=\"cj_distrubuted_devicemanager\"", "LOG_DOMAIN=0xD004111", + "__CJSON_USE_INT64", ] external_deps = [ "access_token:libtokenid_sdk", "bounds_checking_function:libsec_shared", - "cJSON:cjson", "c_utils:utils", "hilog:libhilog", "ipc:ipc_core", diff --git a/interfaces/inner_kits/native_cpp/BUILD.gn b/interfaces/inner_kits/native_cpp/BUILD.gn index eb86d886f..9311ca50b 100644 --- a/interfaces/inner_kits/native_cpp/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/BUILD.gn @@ -23,7 +23,6 @@ if (defined(ohos_lite)) { static_library("devicemanagersdk") { include_dirs = [ "${innerkits_path}/native_cpp/include/mini", - "//third_party/cJSON", "//kernel/liteos_m/kal/cmsis", "//utils/native/lite/include", "//kernel/liteos_m/kal/posix/include", @@ -51,6 +50,7 @@ if (defined(ohos_lite)) { "//commonlibrary/utils_lite:utils", "//foundation/systemabilitymgr/samgr_lite/samgr", "//third_party/bounds_checking_function:libsec_static", + "//third_party/cJSON:cjson", ] cflags = [ @@ -83,8 +83,8 @@ if (defined(ohos_lite)) { "${samgr_lite_path}/kits/registry", "${utils_lite_path}/include", "${utils_path}/include", + "${json_path}/include", "//third_party/bounds_checking_function/include", - "//third_party/json/include", "${interfaces_path}/c/ipc/include", "//foundation/distributedshedule/samgr_lite/interfaces/kits/samgr", "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include", @@ -96,7 +96,6 @@ if (defined(ohos_lite)) { "${common_path}/src/dfx/lite/dm_hitrace.cpp", "${common_path}/src/dm_anonymous.cpp", "${common_path}/src/dm_constants.cpp", - "${common_path}/src/json_object.cpp", "${devicemanager_path}/radar/src/lite/dm_radar_helper.cpp", "${utils_path}/src/dm_random.cpp", "src/device_manager.cpp", @@ -118,6 +117,7 @@ if (defined(ohos_lite)) { ] deps = [ + "${json_path}:devicemanagerjson", "${utils_path}:devicemanagerutils", "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", "//base/security/device_auth/services:deviceauth_sdk", @@ -145,6 +145,7 @@ if (defined(ohos_lite)) { "${common_path}/include/dfx/standard", "${devicemanager_path}/radar/include", "${utils_path}/include", + "${json_path}/include", ] } @@ -175,7 +176,6 @@ if (defined(ohos_lite)) { "${common_path}/src/dm_constants.cpp", "${common_path}/src/ipc/standard/ipc_cmd_register.cpp", "${common_path}/src/ipc/standard/ipc_model_codec.cpp", - "${common_path}/src/json_object.cpp", "${devicemanager_path}/radar/src/dm_radar_helper.cpp", "${utils_path}/src/dm_random.cpp", "src/device_manager.cpp", @@ -198,12 +198,14 @@ if (defined(ohos_lite)) { "HI_LOG_ENABLE", "DH_LOG_TAG=\"devicemanagerkit\"", "LOG_DOMAIN=0xD004111", + "__CJSON_USE_INT64", ] + deps = [ "${json_path}:devicemanagerjson" ] + external_deps = [ "access_token:libaccesstoken_sdk", "access_token:libtokenid_sdk", - "cJSON:cjson", "c_utils:utils", "ffrt:libffrt", "hilog:libhilog", @@ -218,8 +220,6 @@ if (defined(ohos_lite)) { "samgr:samgr_proxy", ] - public_external_deps = [ "cJSON:cjson" ] - subsystem_name = "distributedhardware" part_name = "device_manager" diff --git a/interfaces/kits/js/BUILD.gn b/interfaces/kits/js/BUILD.gn index 51ae9aeea..cf569b33b 100644 --- a/interfaces/kits/js/BUILD.gn +++ b/interfaces/kits/js/BUILD.gn @@ -51,18 +51,21 @@ ohos_shared_library("devicemanager") { "src/native_devicemanager_js.cpp", ] - deps = [ "${innerkits_path}/native_cpp:devicemanagersdk" ] + deps = [ + "${innerkits_path}/native_cpp:devicemanagersdk", + "${json_path}:devicemanagerjson", + ] defines = [ "HI_LOG_ENABLE", "DH_LOG_TAG=\"devicemanagerkit_js\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] external_deps = [ "access_token:libtokenid_sdk", "bounds_checking_function:libsec_shared", - "cJSON:cjson", "c_utils:utils", "hilog:libhilog", "ipc:ipc_core", diff --git a/interfaces/kits/js4.0/BUILD.gn b/interfaces/kits/js4.0/BUILD.gn index 93e058a6e..e53748d02 100644 --- a/interfaces/kits/js4.0/BUILD.gn +++ b/interfaces/kits/js4.0/BUILD.gn @@ -53,18 +53,21 @@ ohos_shared_library("distributeddevicemanager") { "src/native_devicemanager_js.cpp", ] - deps = [ "${innerkits_path}/native_cpp:devicemanagersdk" ] + deps = [ + "${innerkits_path}/native_cpp:devicemanagersdk", + "${json_path}:devicemanagerjson", + ] defines = [ "HI_LOG_ENABLE", "DH_LOG_TAG=\"devicemanagerkit_js\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] external_deps = [ "access_token:libtokenid_sdk", "bounds_checking_function:libsec_shared", - "cJSON:cjson", "c_utils:utils", "hilog:libhilog", "ipc:ipc_core", diff --git a/interfaces/mini_tools_kits/native_cpp/BUILD.gn b/interfaces/mini_tools_kits/native_cpp/BUILD.gn index f7057c9d3..586368198 100644 --- a/interfaces/mini_tools_kits/native_cpp/BUILD.gn +++ b/interfaces/mini_tools_kits/native_cpp/BUILD.gn @@ -113,6 +113,7 @@ if (defined(ohos_lite)) { "HI_LOG_ENABLE", "DH_LOG_TAG=\"devicemanagerminikit\"", "LOG_DOMAIN=0xD004111", + "__CJSON_USE_INT64", ] external_deps = [ diff --git a/json/BUILD.gn b/json/BUILD.gn new file mode 100644 index 000000000..0c835e69d --- /dev/null +++ b/json/BUILD.gn @@ -0,0 +1,107 @@ +# Copyright (c) 2025 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +if (defined(ohos_lite)) { + import("//build/lite/config/component/lite_component.gni") +} else { + import("//build/ohos.gni") +} +import("//foundation/distributedhardware/device_manager/device_manager.gni") + +if (defined(ohos_lite)) { + if (ohos_kernel_type == "linux") { + shared_library("devicemanagerjson") { + include_dirs = [ + "include", + "${common_path}/include", + ] + + sources = [ + "src/dm_cJSON.cpp", + "src/json_object.cpp", + ] + + defines = [ + "HI_LOG_ENABLE", + "DH_LOG_TAG=\"devicemanagerjson\"", + "LOG_DOMAIN=0xD004110", + "CJSON_NESTING_LIMIT=(128)", + ] + + deps = [ "${hilog_path}:hilog_shared" ] + } + } +} else { + config("cflags_config") { + cflags = [ + "-Werror", + "-fPIC", + "-fstack-protector-strong", + "-ffunction-sections", + "-fdata-sections", + "-fvisibility=hidden", + "-Oz", + "-flto", + ] + ldflags = [ "-flto" ] + } + + ohos_shared_library("devicemanagerjson") { + branch_protector_ret = "pac_ret" + + include_dirs = [ + "include", + "${common_path}/include", + ] + + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } + + cflags = [ + "-Werror", + "-fPIC", + "-fstack-protector-strong", + ] + + ldflags = [ + "-Wl,-z,relro", + "-Wl,-z,now", + ] + + configs = [ ":cflags_config" ] + + sources = [ + "src/dm_cJSON.cpp", + "src/json_object.cpp", + ] + + defines = [ + "HI_LOG_ENABLE", + "DH_LOG_TAG=\"devicemanagerjson\"", + "LOG_DOMAIN=0xD004110", + "CJSON_NESTING_LIMIT=(128)", + "__CJSON_USE_INT64", + ] + + deps = [] + + external_deps = [ "hilog:libhilog" ] + + subsystem_name = "distributedhardware" + + part_name = "device_manager" + } +} diff --git a/json/include/dm_cJSON.h b/json/include/dm_cJSON.h new file mode 100644 index 000000000..92870a0d8 --- /dev/null +++ b/json/include/dm_cJSON.h @@ -0,0 +1,339 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* + Copyright (c) 2009-2017 Dave Gamble and cJSON contributors + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. +*/ + +#ifndef DM_CJSON_H +#define DM_CJSON_H + +#if !defined(__WINDOWS__) && (defined(WIN32) || defined(WIN64) || defined(_MSC_VER) || defined(_WIN32)) +#define __WINDOWS__ +#endif + +#ifdef __WINDOWS__ + +/* When compiling for windows, we specify a specific calling convention to avoid issues where we are being called from a project with a different default calling convention. For windows you have 3 define options: + +CJSON_HIDE_SYMBOLS - Define this in the case where you don't want to ever dllexport symbols +CJSON_EXPORT_SYMBOLS - Define this on library build when you want to dllexport symbols (default) +CJSON_IMPORT_SYMBOLS - Define this if you want to dllimport symbol + +For *nix builds that support visibility attribute, you can define similar behavior by + +setting default visibility to hidden by adding +-fvisibility=hidden (for gcc) +or +-xldscope=hidden (for sun cc) +to CFLAGS + +then using the CJSON_API_VISIBILITY flag to "export" the same symbols the way CJSON_EXPORT_SYMBOLS does + +*/ + +#define CJSON_CDECL __cdecl +#define CJSON_STDCALL __stdcall + +/* export symbols by default, this is necessary for copy pasting the C and header file */ +#if !defined(CJSON_HIDE_SYMBOLS) && !defined(CJSON_IMPORT_SYMBOLS) && !defined(CJSON_EXPORT_SYMBOLS) +#define CJSON_EXPORT_SYMBOLS +#endif + +#if defined(CJSON_HIDE_SYMBOLS) +#define CJSON_PUBLIC(type) type CJSON_STDCALL +#elif defined(CJSON_EXPORT_SYMBOLS) +#define CJSON_PUBLIC(type) __declspec(dllexport) type CJSON_STDCALL +#elif defined(CJSON_IMPORT_SYMBOLS) +#define CJSON_PUBLIC(type) __declspec(dllimport) type CJSON_STDCALL +#endif +#else /* !__WINDOWS__ */ +#define CJSON_CDECL +#define CJSON_STDCALL + +#if (defined(__GNUC__) || defined(__SUNPRO_CC) || defined (__SUNPRO_C)) && defined(CJSON_API_VISIBILITY) +#define CJSON_PUBLIC(type) __attribute__((visibility("default"))) type +#else +#define CJSON_PUBLIC(type) type +#endif +#endif + +/* project version */ +#define CJSON_VERSION_MAJOR 1 +#define CJSON_VERSION_MINOR 7 +#define CJSON_VERSION_PATCH 17 + +#include + +/* use int64 if it is enabled and supported */ +#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L && defined(ENABLE_INT64) +#define __CJSON_USE_INT64 +#endif + +/* cJSON Types: */ +#define cJSON_Invalid (0) +#define cJSON_False (1 << 0) +#define cJSON_True (1 << 1) +#define cJSON_NULL (1 << 2) +#define cJSON_Number (1 << 3) +#define cJSON_String (1 << 4) +#define cJSON_Array (1 << 5) +#define cJSON_Object (1 << 6) +#define cJSON_Raw (1 << 7) /* raw json */ + +#define cJSON_IsReference 256 +#define cJSON_StringIsConst 512 +#ifdef __CJSON_USE_INT64 +#define cJSON_IsInt64 1024 +#endif + +namespace OHOS{ +namespace DistributedHardware{ +namespace DmJson{ + +/* The cJSON structure: */ +typedef struct cJSON +{ + /* next/prev allow you to walk array/object chains. Alternatively, use GetArraySize/GetArrayItem/GetObjectItem */ + struct cJSON *next; + struct cJSON *prev; + /* An array or object item will have a child pointer pointing to a chain of the items in the array/object. */ + struct cJSON *child; + + /* The type of the item, as above. */ + int type; + + /* The item's string, if type==cJSON_String and type == cJSON_Raw */ + char *valuestring; +#ifdef __CJSON_USE_INT64 + /* use long long if int64 is enabled */ + long long valueint; +#else + /* writing to valueint is DEPRECATED, use cJSON_SetNumberValue instead */ + int valueint; +#endif /* __CJSON_USE_INT64 */ + /* The item's number, if type==cJSON_Number */ + double valuedouble; + + /* The item's name string, if this item is the child of, or is in the list of subitems of an object. */ + char *string; +} cJSON; + +typedef struct cJSON_Hooks +{ + /* malloc/free are CDECL on Windows regardless of the default calling convention of the compiler, so ensure the hooks allow passing those functions directly. */ + void *(CJSON_CDECL *malloc_fn)(size_t sz); + void (CJSON_CDECL *free_fn)(void *ptr); +} cJSON_Hooks; + +typedef int cJSON_bool; + +/* Limits how deeply nested arrays/objects can be before cJSON rejects to parse them. + * This is to prevent stack overflows. */ +#ifndef CJSON_NESTING_LIMIT +#define CJSON_NESTING_LIMIT 1000 +#endif + +/* returns the version of cJSON as a string */ +CJSON_PUBLIC(const char*) cJSON_Version(void); + +/* Supply malloc, realloc and free functions to cJSON */ +CJSON_PUBLIC(void) cJSON_InitHooks(cJSON_Hooks* hooks); + +/* Memory Management: the caller is always responsible to free the results from all variants of cJSON_Parse (with cJSON_Delete) and cJSON_Print (with stdlib free, cJSON_Hooks.free_fn, or cJSON_free as appropriate). The exception is cJSON_PrintPreallocated, where the caller has full responsibility of the buffer. */ +/* Supply a block of JSON, and this returns a cJSON object you can interrogate. */ +CJSON_PUBLIC(cJSON *) cJSON_Parse(const char *value); +CJSON_PUBLIC(cJSON *) cJSON_ParseWithLength(const char *value, size_t buffer_length); +/* ParseWithOpts allows you to require (and check) that the JSON is null terminated, and to retrieve the pointer to the final byte parsed. */ +/* If you supply a ptr in return_parse_end and parsing fails, then return_parse_end will contain a pointer to the error so will match cJSON_GetErrorPtr(). */ +CJSON_PUBLIC(cJSON *) cJSON_ParseWithOpts(const char *value, const char **return_parse_end, cJSON_bool require_null_terminated); +CJSON_PUBLIC(cJSON *) cJSON_ParseWithLengthOpts(const char *value, size_t buffer_length, const char **return_parse_end, cJSON_bool require_null_terminated); + +/* Render a cJSON entity to text for transfer/storage. */ +CJSON_PUBLIC(char *) cJSON_Print(const cJSON *item); +/* Render a cJSON entity to text for transfer/storage without any formatting. */ +CJSON_PUBLIC(char *) cJSON_PrintUnformatted(const cJSON *item); +/* Render a cJSON entity to text using a buffered strategy. prebuffer is a guess at the final size. guessing well reduces reallocation. fmt=0 gives unformatted, =1 gives formatted */ +CJSON_PUBLIC(char *) cJSON_PrintBuffered(const cJSON *item, int prebuffer, cJSON_bool fmt); +/* Render a cJSON entity to text using a buffer already allocated in memory with given length. Returns 1 on success and 0 on failure. */ +/* NOTE: cJSON is not always 100% accurate in estimating how much memory it will use, so to be safe allocate 5 bytes more than you actually need */ +CJSON_PUBLIC(cJSON_bool) cJSON_PrintPreallocated(cJSON *item, char *buffer, const int length, const cJSON_bool format); +/* Delete a cJSON entity and all subentities. */ +CJSON_PUBLIC(void) cJSON_Delete(cJSON *item); + +/* Returns the number of items in an array (or object). */ +CJSON_PUBLIC(int) cJSON_GetArraySize(const cJSON *array); +/* Retrieve item number "index" from array "array". Returns NULL if unsuccessful. */ +CJSON_PUBLIC(cJSON *) cJSON_GetArrayItem(const cJSON *array, int index); +/* Get item "string" from object. Case insensitive. */ +CJSON_PUBLIC(cJSON *) cJSON_GetObjectItem(const cJSON * const object, const char * const string); +CJSON_PUBLIC(cJSON *) cJSON_GetObjectItemCaseSensitive(const cJSON * const object, const char * const string); +CJSON_PUBLIC(cJSON_bool) cJSON_HasObjectItem(const cJSON *object, const char *string); +/* For analysing failed parses. This returns a pointer to the parse error. You'll probably need to look a few chars back to make sense of it. Defined when cJSON_Parse() returns 0. 0 when cJSON_Parse() succeeds. */ +CJSON_PUBLIC(const char *) cJSON_GetErrorPtr(void); + +/* Check item type and return its value */ +CJSON_PUBLIC(char *) cJSON_GetStringValue(const cJSON * const item); +#ifdef __CJSON_USE_INT64 +CJSON_PUBLIC(long long *) cJSON_GetInt64NumberValue(cJSON * const item); +#endif +CJSON_PUBLIC(double) cJSON_GetNumberValue(const cJSON * const item); + +/* These functions check the type of an item */ +CJSON_PUBLIC(cJSON_bool) cJSON_IsInvalid(const cJSON * const item); +CJSON_PUBLIC(cJSON_bool) cJSON_IsFalse(const cJSON * const item); +CJSON_PUBLIC(cJSON_bool) cJSON_IsTrue(const cJSON * const item); +CJSON_PUBLIC(cJSON_bool) cJSON_IsBool(const cJSON * const item); +CJSON_PUBLIC(cJSON_bool) cJSON_IsNull(const cJSON * const item); +#ifdef __CJSON_USE_INT64 +CJSON_PUBLIC(cJSON_bool) cJSON_IsInt64Number(const cJSON * const item); +#endif +CJSON_PUBLIC(cJSON_bool) cJSON_IsNumber(const cJSON * const item); +CJSON_PUBLIC(cJSON_bool) cJSON_IsString(const cJSON * const item); +CJSON_PUBLIC(cJSON_bool) cJSON_IsArray(const cJSON * const item); +CJSON_PUBLIC(cJSON_bool) cJSON_IsObject(const cJSON * const item); +CJSON_PUBLIC(cJSON_bool) cJSON_IsRaw(const cJSON * const item); + +/* These calls create a cJSON item of the appropriate type. */ +CJSON_PUBLIC(cJSON *) cJSON_CreateNull(void); +CJSON_PUBLIC(cJSON *) cJSON_CreateTrue(void); +CJSON_PUBLIC(cJSON *) cJSON_CreateFalse(void); +CJSON_PUBLIC(cJSON *) cJSON_CreateBool(cJSON_bool boolean); +CJSON_PUBLIC(cJSON *) cJSON_CreateNumber(double num); +#ifdef __CJSON_USE_INT64 +CJSON_PUBLIC(cJSON *) cJSON_CreateInt64Number(long long integer); +#endif +CJSON_PUBLIC(cJSON *) cJSON_CreateString(const char *string); +/* raw json */ +CJSON_PUBLIC(cJSON *) cJSON_CreateRaw(const char *raw); +CJSON_PUBLIC(cJSON *) cJSON_CreateArray(void); +CJSON_PUBLIC(cJSON *) cJSON_CreateObject(void); + +/* Create a string where valuestring references a string so + * it will not be freed by cJSON_Delete */ +CJSON_PUBLIC(cJSON *) cJSON_CreateStringReference(const char *string); +/* Create an object/array that only references it's elements so + * they will not be freed by cJSON_Delete */ +CJSON_PUBLIC(cJSON *) cJSON_CreateObjectReference(const cJSON *child); +CJSON_PUBLIC(cJSON *) cJSON_CreateArrayReference(const cJSON *child); + +/* These utilities create an Array of count items. + * The parameter count cannot be greater than the number of elements in the number array, otherwise array access will be out of bounds.*/ +CJSON_PUBLIC(cJSON *) cJSON_CreateIntArray(const int *numbers, int count); +CJSON_PUBLIC(cJSON *) cJSON_CreateFloatArray(const float *numbers, int count); +CJSON_PUBLIC(cJSON *) cJSON_CreateDoubleArray(const double *numbers, int count); +CJSON_PUBLIC(cJSON *) cJSON_CreateStringArray(const char *const *strings, int count); + +/* Append item to the specified array/object. */ +CJSON_PUBLIC(cJSON_bool) cJSON_AddItemToArray(cJSON *array, cJSON *item); +CJSON_PUBLIC(cJSON_bool) cJSON_AddItemToObject(cJSON *object, const char *string, cJSON *item); +/* Use this when string is definitely const (i.e. a literal, or as good as), and will definitely survive the cJSON object. + * WARNING: When this function was used, make sure to always check that (item->type & cJSON_StringIsConst) is zero before + * writing to `item->string` */ +CJSON_PUBLIC(cJSON_bool) cJSON_AddItemToObjectCS(cJSON *object, const char *string, cJSON *item); +/* Append reference to item to the specified array/object. Use this when you want to add an existing cJSON to a new cJSON, but don't want to corrupt your existing cJSON. */ +CJSON_PUBLIC(cJSON_bool) cJSON_AddItemReferenceToArray(cJSON *array, cJSON *item); +CJSON_PUBLIC(cJSON_bool) cJSON_AddItemReferenceToObject(cJSON *object, const char *string, cJSON *item); + +/* Remove/Detach items from Arrays/Objects. */ +CJSON_PUBLIC(cJSON *) cJSON_DetachItemViaPointer(cJSON *parent, cJSON * const item); +CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromArray(cJSON *array, int which); +CJSON_PUBLIC(void) cJSON_DeleteItemFromArray(cJSON *array, int which); +CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromObject(cJSON *object, const char *string); +CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromObjectCaseSensitive(cJSON *object, const char *string); +CJSON_PUBLIC(void) cJSON_DeleteItemFromObject(cJSON *object, const char *string); +CJSON_PUBLIC(void) cJSON_DeleteItemFromObjectCaseSensitive(cJSON *object, const char *string); + +/* Update array items. */ +CJSON_PUBLIC(cJSON_bool) cJSON_InsertItemInArray(cJSON *array, int which, cJSON *newitem); /* Shifts pre-existing items to the right. */ +CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemViaPointer(cJSON * const parent, cJSON * const item, cJSON * replacement); +CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemInArray(cJSON *array, int which, cJSON *newitem); +CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemInObject(cJSON *object,const char *string,cJSON *newitem); +CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemInObjectCaseSensitive(cJSON *object,const char *string,cJSON *newitem); + +/* Duplicate a cJSON item */ +CJSON_PUBLIC(cJSON *) cJSON_Duplicate(const cJSON *item, cJSON_bool recurse); +/* Duplicate will create a new, identical cJSON item to the one you pass, in new memory that will + * need to be released. With recurse!=0, it will duplicate any children connected to the item. + * The item->next and ->prev pointers are always zero on return from Duplicate. */ +/* Recursively compare two cJSON items for equality. If either a or b is NULL or invalid, they will be considered unequal. + * case_sensitive determines if object keys are treated case sensitive (1) or case insensitive (0) */ +CJSON_PUBLIC(cJSON_bool) cJSON_Compare(const cJSON * const a, const cJSON * const b, const cJSON_bool case_sensitive); + +/* Minify a strings, remove blank characters(such as ' ', '\t', '\r', '\n') from strings. + * The input pointer json cannot point to a read-only address area, such as a string constant, + * but should point to a readable and writable address area. */ +CJSON_PUBLIC(void) cJSON_Minify(char *json); + +/* Helper functions for creating and adding items to an object at the same time. + * They return the added item or NULL on failure. */ +CJSON_PUBLIC(cJSON*) cJSON_AddNullToObject(cJSON * const object, const char * const name); +CJSON_PUBLIC(cJSON*) cJSON_AddTrueToObject(cJSON * const object, const char * const name); +CJSON_PUBLIC(cJSON*) cJSON_AddFalseToObject(cJSON * const object, const char * const name); +CJSON_PUBLIC(cJSON*) cJSON_AddBoolToObject(cJSON * const object, const char * const name, const cJSON_bool boolean); +#ifdef __CJSON_USE_INT64 +CJSON_PUBLIC(cJSON*) cJSON_AddInt64NumberToObject(cJSON * const object, const char * const name, const long long integer); +#endif +CJSON_PUBLIC(cJSON*) cJSON_AddNumberToObject(cJSON * const object, const char * const name, const double number); +CJSON_PUBLIC(cJSON*) cJSON_AddStringToObject(cJSON * const object, const char * const name, const char * const string); +CJSON_PUBLIC(cJSON*) cJSON_AddRawToObject(cJSON * const object, const char * const name, const char * const raw); +CJSON_PUBLIC(cJSON*) cJSON_AddObjectToObject(cJSON * const object, const char * const name); +CJSON_PUBLIC(cJSON*) cJSON_AddArrayToObject(cJSON * const object, const char * const name); + +#ifdef __CJSON_USE_INT64 +CJSON_PUBLIC(long long) cJSON_SetInt64NumberValue(cJSON * const object, const long long integer); +#endif +/* When assigning an integer value, it needs to be propagated to valuedouble too. */ +#define cJSON_SetIntValue(object, number) ((object) ? (object)->valueint = (object)->valuedouble = (number) : (number)) +/* helper for the cJSON_SetNumberValue macro */ +CJSON_PUBLIC(double) cJSON_SetNumberHelper(cJSON *object, double number); +#define cJSON_SetNumberValue(object, number) ((object != NULL) ? cJSON_SetNumberHelper(object, (double)number) : (number)) +/* Change the valuestring of a cJSON_String object, only takes effect when type of object is cJSON_String */ +CJSON_PUBLIC(char*) cJSON_SetValuestring(cJSON *object, const char *valuestring); + +/* If the object is not a boolean type this does nothing and returns cJSON_Invalid else it returns the new type*/ +#define cJSON_SetBoolValue(object, boolValue) ( \ + (object != NULL && ((object)->type & (cJSON_False|cJSON_True))) ? \ + (object)->type=((object)->type &(~(cJSON_False|cJSON_True)))|((boolValue)?cJSON_True:cJSON_False) : \ + cJSON_Invalid\ +) + +/* Macro for iterating over an array or object */ +#define cJSON_ArrayForEach(element, array) for(element = (array != NULL) ? (array)->child : NULL; element != NULL; element = element->next) + +/* malloc/free objects using the malloc/free functions that have been set with cJSON_InitHooks */ +CJSON_PUBLIC(void *) cJSON_malloc(size_t size); +CJSON_PUBLIC(void) cJSON_free(void *object); +} // namespace DmJson +} // namespace DistributedHardware +} // namespace OHOS +#endif diff --git a/common/include/json_object.h b/json/include/json_object.h similarity index 97% rename from common/include/json_object.h rename to json/include/json_object.h index 6846872bb..a1501fa7c 100644 --- a/common/include/json_object.h +++ b/json/include/json_object.h @@ -1,193 +1,194 @@ -/* - * Copyright (c) 2025 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef JSON_OBJECT_H -#define JSON_OBJECT_H - -#include -#include - -#include "cJSON.h" - -#ifndef EXPORT -#define EXPORT __attribute__ ((visibility ("default"))) -#endif // EXPORT - -namespace OHOS { -namespace DistributedHardware { -class JsonObject; -class JsonItemObject { - friend void ToJson(JsonItemObject &itemObject, const std::string &value); - friend void ToJson(JsonItemObject &itemObject, const char *value); - friend void ToJson(JsonItemObject &itemObject, const double &value); - friend void ToJson(JsonItemObject &itemObject, const bool &value); - friend void ToJson(JsonItemObject &itemObject, const uint8_t &value); - friend void ToJson(JsonItemObject &itemObject, const int16_t &value); - friend void ToJson(JsonItemObject &itemObject, const uint16_t &value); - friend void ToJson(JsonItemObject &itemObject, const int32_t &value); - friend void ToJson(JsonItemObject &itemObject, const uint32_t &value); - friend void ToJson(JsonItemObject &itemObject, const int64_t &value); - friend void ToJson(JsonItemObject &itemObject, const uint64_t &value); -public: - EXPORT JsonItemObject(const JsonItemObject &object); - JsonItemObject(const JsonObject &object) = delete; - EXPORT virtual ~JsonItemObject(); - EXPORT bool IsString() const; - bool IsNumber() const; - EXPORT bool IsNumberInteger() const; - bool IsArray() const; - bool IsBoolean() const; - bool IsObject() const; - JsonItemObject& operator=(const JsonItemObject &object); - JsonItemObject& operator=(const JsonObject &object) = delete; - EXPORT JsonItemObject operator[](const std::string &key); - EXPORT const JsonItemObject operator[](const std::string &key) const; - std::string DumpFormated() const; - std::string Dump() const; - EXPORT bool Contains(const std::string &key) const; - EXPORT bool IsDiscarded() const; - bool PushBack(const std::string &strValue); - bool PushBack(const double &value); - bool PushBack(const int64_t &value); - bool PushBack(const JsonItemObject &item); - std::string Key() const; - void Insert(const std::string &key, const JsonItemObject &object); - JsonItemObject At(const std::string &key) const; - void GetTo(std::string &strValue) const; - void GetTo(double &value) const; - void GetTo(int32_t &value) const; - void GetTo(uint32_t &value) const; - void GetTo(int64_t &value) const; - void GetTo(bool &value) const; - std::vector Items() const; - void Erase(const std::string &key); - - template - T Get() const - { - T value; - FromJson(*this, value); - return value; - } - - template - void Get(std::vector &dataList) const - { - dataList.clear(); - if (!IsArray()) { - return; - } - for (auto& item : this->Items()) { - T element; - FromJson(item, element); - dataList.push_back(element); - } - } - - template - JsonItemObject& operator=(const T &value) - { - JsonItemObject newItem; - if (!InitItem(newItem)) { - return *this; - } - ToJson(newItem, value); - if (!ReplaceItem(newItem.item_)) { - newItem.needDeleteItem_ = true; - return *this; - } - return *this; - } - - template - JsonItemObject& operator=(const std::vector &values) - { - if (!InitArray()) { - return *this; - } - for (const auto& value : values) { - JsonItemObject operationItem; - operationItem.parent_ = item_; - operationItem.beValid_ = true; - operationItem = value; - if (cJSON_AddItemToArray(item_, operationItem.item_)) { - operationItem.itemIndex_ = cJSON_GetArraySize(item_) - 1; - } else if (operationItem.item_ != nullptr) { - // item add fail, need delete - operationItem.needDeleteItem_ = true; - } - } - return *this; - } -protected: - EXPORT JsonItemObject(); - void Delete(); - EXPORT std::string Dump(bool formatFlag) const; - bool AddToArray(cJSON *newItem); - EXPORT bool InitItem(JsonItemObject &item); - bool InitArray(); - EXPORT bool ReplaceItem(cJSON *newItem); -protected: - cJSON *item_ = nullptr; - cJSON *parent_ = nullptr; - int32_t itemIndex_ = -1; - bool needDeleteItem_ = false; - bool beValid_ = false; - std::string itemName_ = ""; -}; - -enum class JsonCreateType { - JSON_CREATE_TYPE_OBJECT = 0, - JSON_CREATE_TYPE_ARRAY -}; - -class JsonObject : public JsonItemObject { -public: - using JsonItemObject::operator=; - JsonObject(JsonCreateType type = JsonCreateType::JSON_CREATE_TYPE_OBJECT); - EXPORT JsonObject(const std::string &strJson); - JsonObject(const JsonObject &object) = delete; - JsonObject& operator=(const JsonObject &object) = delete; - JsonObject& operator=(const JsonItemObject &object) = delete; - EXPORT ~JsonObject(); - bool Parse(const std::string &strJson); - void Duplicate(const JsonObject &object); -}; - -EXPORT void ToJson(JsonItemObject &itemObject, const std::string &value); -void ToJson(JsonItemObject &itemObject, const char *value); -void ToJson(JsonItemObject &itemObject, const double &value); -void ToJson(JsonItemObject &itemObject, const bool &value); -void ToJson(JsonItemObject &itemObject, const uint8_t &value); -void ToJson(JsonItemObject &itemObject, const int16_t &value); -void ToJson(JsonItemObject &itemObject, const uint16_t &value); -void ToJson(JsonItemObject &itemObject, const int32_t &value); -void ToJson(JsonItemObject &itemObject, const uint32_t &value); -EXPORT void ToJson(JsonItemObject &itemObject, const int64_t &value); -void ToJson(JsonItemObject &itemObject, const uint64_t &value); -EXPORT void FromJson(const JsonItemObject &itemObject, std::string &value); -void FromJson(const JsonItemObject &itemObject, double &value); -void FromJson(const JsonItemObject &itemObject, bool &value); -void FromJson(const JsonItemObject &itemObject, uint8_t &value); -void FromJson(const JsonItemObject &itemObject, int16_t &value); -void FromJson(const JsonItemObject &itemObject, uint16_t &value); -void FromJson(const JsonItemObject &itemObject, int32_t &value); -void FromJson(const JsonItemObject &itemObject, uint32_t &value); -EXPORT void FromJson(const JsonItemObject &itemObject, int64_t &value); -void FromJson(const JsonItemObject &itemObject, uint64_t &value); -std::string ToString(const JsonItemObject &jsonItem); -} // namespace DistributedHardware -} // namespace OHOS +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef JSON_OBJECT_H +#define JSON_OBJECT_H + +#include +#include + +#include "dm_cJSON.h" + +#ifndef EXPORT +#define EXPORT __attribute__ ((visibility ("default"))) +#endif // EXPORT + +namespace OHOS { +namespace DistributedHardware { +using namespace DmJson; +class JsonObject; +class JsonItemObject { + friend void ToJson(JsonItemObject &itemObject, const std::string &value); + friend void ToJson(JsonItemObject &itemObject, const char *value); + friend void ToJson(JsonItemObject &itemObject, const double &value); + friend void ToJson(JsonItemObject &itemObject, const bool &value); + friend void ToJson(JsonItemObject &itemObject, const uint8_t &value); + friend void ToJson(JsonItemObject &itemObject, const int16_t &value); + friend void ToJson(JsonItemObject &itemObject, const uint16_t &value); + friend void ToJson(JsonItemObject &itemObject, const int32_t &value); + friend void ToJson(JsonItemObject &itemObject, const uint32_t &value); + friend void ToJson(JsonItemObject &itemObject, const int64_t &value); + friend void ToJson(JsonItemObject &itemObject, const uint64_t &value); +public: + EXPORT JsonItemObject(const JsonItemObject &object); + JsonItemObject(const JsonObject &object) = delete; + EXPORT virtual ~JsonItemObject(); + EXPORT bool IsString() const; + bool IsNumber() const; + EXPORT bool IsNumberInteger() const; + bool IsArray() const; + bool IsBoolean() const; + bool IsObject() const; + JsonItemObject& operator=(const JsonItemObject &object); + JsonItemObject& operator=(const JsonObject &object) = delete; + EXPORT JsonItemObject operator[](const std::string &key); + EXPORT const JsonItemObject operator[](const std::string &key) const; + std::string DumpFormated() const; + std::string Dump() const; + EXPORT bool Contains(const std::string &key) const; + EXPORT bool IsDiscarded() const; + bool PushBack(const std::string &strValue); + bool PushBack(const double &value); + bool PushBack(const int64_t &value); + bool PushBack(const JsonItemObject &item); + std::string Key() const; + void Insert(const std::string &key, const JsonItemObject &object); + JsonItemObject At(const std::string &key) const; + void GetTo(std::string &strValue) const; + void GetTo(double &value) const; + void GetTo(int32_t &value) const; + void GetTo(uint32_t &value) const; + void GetTo(int64_t &value) const; + void GetTo(bool &value) const; + std::vector Items() const; + void Erase(const std::string &key); + + template + T Get() const + { + T value; + FromJson(*this, value); + return value; + } + + template + void Get(std::vector &dataList) const + { + dataList.clear(); + if (!IsArray()) { + return; + } + for (auto& item : this->Items()) { + T element; + FromJson(item, element); + dataList.push_back(element); + } + } + + template + JsonItemObject& operator=(const T &value) + { + JsonItemObject newItem; + if (!InitItem(newItem)) { + return *this; + } + ToJson(newItem, value); + if (!ReplaceItem(newItem.item_)) { + newItem.needDeleteItem_ = true; + return *this; + } + return *this; + } + + template + JsonItemObject& operator=(const std::vector &values) + { + if (!InitArray()) { + return *this; + } + for (const auto& value : values) { + JsonItemObject operationItem; + operationItem.parent_ = item_; + operationItem.beValid_ = true; + operationItem = value; + if (cJSON_AddItemToArray(item_, operationItem.item_)) { + operationItem.itemIndex_ = cJSON_GetArraySize(item_) - 1; + } else if (operationItem.item_ != nullptr) { + // item add fail, need delete + operationItem.needDeleteItem_ = true; + } + } + return *this; + } +protected: + EXPORT JsonItemObject(); + void Delete(); + EXPORT std::string Dump(bool formatFlag) const; + bool AddToArray(cJSON *newItem); + EXPORT bool InitItem(JsonItemObject &item); + bool InitArray(); + EXPORT bool ReplaceItem(cJSON *newItem); +protected: + cJSON *item_ = nullptr; + cJSON *parent_ = nullptr; + int32_t itemIndex_ = -1; + bool needDeleteItem_ = false; + bool beValid_ = false; + std::string itemName_ = ""; +}; + +enum class JsonCreateType { + JSON_CREATE_TYPE_OBJECT = 0, + JSON_CREATE_TYPE_ARRAY +}; + +class JsonObject : public JsonItemObject { +public: + using JsonItemObject::operator=; + JsonObject(JsonCreateType type = JsonCreateType::JSON_CREATE_TYPE_OBJECT); + EXPORT JsonObject(const std::string &strJson); + JsonObject(const JsonObject &object) = delete; + JsonObject& operator=(const JsonObject &object) = delete; + JsonObject& operator=(const JsonItemObject &object) = delete; + EXPORT ~JsonObject(); + bool Parse(const std::string &strJson); + void Duplicate(const JsonObject &object); +}; + +EXPORT void ToJson(JsonItemObject &itemObject, const std::string &value); +void ToJson(JsonItemObject &itemObject, const char *value); +void ToJson(JsonItemObject &itemObject, const double &value); +void ToJson(JsonItemObject &itemObject, const bool &value); +void ToJson(JsonItemObject &itemObject, const uint8_t &value); +void ToJson(JsonItemObject &itemObject, const int16_t &value); +void ToJson(JsonItemObject &itemObject, const uint16_t &value); +void ToJson(JsonItemObject &itemObject, const int32_t &value); +void ToJson(JsonItemObject &itemObject, const uint32_t &value); +EXPORT void ToJson(JsonItemObject &itemObject, const int64_t &value); +void ToJson(JsonItemObject &itemObject, const uint64_t &value); +EXPORT void FromJson(const JsonItemObject &itemObject, std::string &value); +void FromJson(const JsonItemObject &itemObject, double &value); +void FromJson(const JsonItemObject &itemObject, bool &value); +void FromJson(const JsonItemObject &itemObject, uint8_t &value); +void FromJson(const JsonItemObject &itemObject, int16_t &value); +void FromJson(const JsonItemObject &itemObject, uint16_t &value); +void FromJson(const JsonItemObject &itemObject, int32_t &value); +void FromJson(const JsonItemObject &itemObject, uint32_t &value); +EXPORT void FromJson(const JsonItemObject &itemObject, int64_t &value); +void FromJson(const JsonItemObject &itemObject, uint64_t &value); +std::string ToString(const JsonItemObject &jsonItem); +} // namespace DistributedHardware +} // namespace OHOS #endif // JSON_OBJECT_H \ No newline at end of file diff --git a/json/src/dm_cJSON.cpp b/json/src/dm_cJSON.cpp new file mode 100644 index 000000000..ed5cd36eb --- /dev/null +++ b/json/src/dm_cJSON.cpp @@ -0,0 +1,3484 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* + Copyright (c) 2009-2017 Dave Gamble and cJSON contributors + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. +*/ + +/* cJSON */ +/* JSON parser in C. */ + +/* disable warnings about old C89 functions in MSVC */ +#if !defined(_CRT_SECURE_NO_DEPRECATE) && defined(_MSC_VER) +#define _CRT_SECURE_NO_DEPRECATE +#endif + +#ifdef __GNUC__ +#pragma GCC visibility push(default) +#endif +#if defined(_MSC_VER) +#pragma warning (push) +/* disable warning about single line comments in system headers */ +#pragma warning (disable : 4001) +#endif + +#include +#include +#include +#include +#include +#include +#include + +#ifdef ENABLE_LOCALES +#include +#endif + +#if defined(_MSC_VER) +#pragma warning (pop) +#endif +#ifdef __GNUC__ +#pragma GCC visibility pop +#endif + +#include "dm_cJSON.h" + +/* define our own boolean type */ +#ifdef true +#undef true +#endif +#define true ((cJSON_bool)1) + +#ifdef false +#undef false +#endif +#define false ((cJSON_bool)0) + +/* define isnan and isinf for ANSI C, if in C99 or above, isnan and isinf has been defined in math.h */ +#ifndef isinf +#define isinf(d) (isnan((d - d)) && !isnan(d)) +#endif +#ifndef isnan +#define isnan(d) (d != d) +#endif + +#ifndef NAN +#ifdef _WIN32 +#define NAN sqrt(-1.0) +#else +#define NAN 0.0/0.0 +#endif +#endif + +namespace OHOS{ +namespace DistributedHardware{ +namespace DmJson{ +typedef struct { + const unsigned char *json; + size_t position; +} error; +static error global_error = { NULL, 0 }; + +CJSON_PUBLIC(const char *) cJSON_GetErrorPtr(void) +{ + return (const char*) (global_error.json + global_error.position); +} + +CJSON_PUBLIC(char *) cJSON_GetStringValue(const cJSON * const item) +{ + if (!cJSON_IsString(item)) + { + return NULL; + } + + return item->valuestring; +} + +#ifdef __CJSON_USE_INT64 +CJSON_PUBLIC(long long *) cJSON_GetInt64NumberValue(cJSON * const item) +{ + if (!cJSON_IsInt64Number(item)) + { + return NULL; + } + + return &(item->valueint); +} +#endif + +CJSON_PUBLIC(double) cJSON_GetNumberValue(const cJSON * const item) +{ + if (!cJSON_IsNumber(item)) + { + return (double) NAN; + } + + return item->valuedouble; +} + +/* This is a safeguard to prevent copy-pasters from using incompatible C and header files */ +#if (CJSON_VERSION_MAJOR != 1) || (CJSON_VERSION_MINOR != 7) || (CJSON_VERSION_PATCH != 17) + #error cJSON.h and cJSON.c have different versions. Make sure that both have the same. +#endif + +CJSON_PUBLIC(const char*) cJSON_Version(void) +{ + static char version[15]; + sprintf(version, "%i.%i.%i", CJSON_VERSION_MAJOR, CJSON_VERSION_MINOR, CJSON_VERSION_PATCH); + + return version; +} + +/* Case insensitive string comparison, doesn't consider two NULL pointers equal though */ +static int case_insensitive_strcmp(const unsigned char *string1, const unsigned char *string2) +{ + if ((string1 == NULL) || (string2 == NULL)) + { + return 1; + } + + if (string1 == string2) + { + return 0; + } + + for(; tolower(*string1) == tolower(*string2); (void)string1++, string2++) + { + if (*string1 == '\0') + { + return 0; + } + } + + return tolower(*string1) - tolower(*string2); +} + +typedef struct internal_hooks +{ + void *(CJSON_CDECL *allocate)(size_t size); + void (CJSON_CDECL *deallocate)(void *pointer); + void *(CJSON_CDECL *reallocate)(void *pointer, size_t size); +} internal_hooks; + +#if defined(_MSC_VER) +/* work around MSVC error C2322: '...' address of dllimport '...' is not static */ +static void * CJSON_CDECL internal_malloc(size_t size) +{ + return malloc(size); +} +static void CJSON_CDECL internal_free(void *pointer) +{ + free(pointer); +} +static void * CJSON_CDECL internal_realloc(void *pointer, size_t size) +{ + return realloc(pointer, size); +} +#else +#define internal_malloc malloc +#define internal_free free +#define internal_realloc realloc +#endif + +/* strlen of character literals resolved at compile time */ +#define static_strlen(string_literal) (sizeof(string_literal) - sizeof("")) + +static internal_hooks global_hooks = { internal_malloc, internal_free, internal_realloc }; + +static unsigned char* cJSON_strdup(const unsigned char* string, const internal_hooks * const hooks) +{ + size_t length = 0; + unsigned char *copy = NULL; + + if (string == NULL) + { + return NULL; + } + + length = strlen((const char*)string) + sizeof(""); + copy = (unsigned char*)hooks->allocate(length); + if (copy == NULL) + { + return NULL; + } + memcpy(copy, string, length); + + return copy; +} + +CJSON_PUBLIC(void) cJSON_InitHooks(cJSON_Hooks* hooks) +{ + if (hooks == NULL) + { + /* Reset hooks */ + global_hooks.allocate = malloc; + global_hooks.deallocate = free; + global_hooks.reallocate = realloc; + return; + } + + global_hooks.allocate = malloc; + if (hooks->malloc_fn != NULL) + { + global_hooks.allocate = hooks->malloc_fn; + } + + global_hooks.deallocate = free; + if (hooks->free_fn != NULL) + { + global_hooks.deallocate = hooks->free_fn; + } + + /* use realloc only if both free and malloc are used */ + global_hooks.reallocate = NULL; + if ((global_hooks.allocate == malloc) && (global_hooks.deallocate == free)) + { + global_hooks.reallocate = realloc; + } +} + +/* Internal constructor. */ +static cJSON *cJSON_New_Item(const internal_hooks * const hooks) +{ + cJSON* node = (cJSON*)hooks->allocate(sizeof(cJSON)); + if (node) + { + memset(node, '\0', sizeof(cJSON)); + } + + return node; +} + +/* Delete a cJSON structure. */ +CJSON_PUBLIC(void) cJSON_Delete(cJSON *item) +{ + cJSON *next = NULL; + while (item != NULL) + { + next = item->next; + if (!(item->type & cJSON_IsReference) && (item->child != NULL)) + { + cJSON_Delete(item->child); + } + if (!(item->type & cJSON_IsReference) && (item->valuestring != NULL)) + { + global_hooks.deallocate(item->valuestring); + item->valuestring = NULL; + } + if (!(item->type & cJSON_StringIsConst) && (item->string != NULL)) + { + global_hooks.deallocate(item->string); + item->string = NULL; + } + if (next == item) + { + break; + } + global_hooks.deallocate(item); + item = next; + } +} + +/* get the decimal point character of the current locale */ +static unsigned char get_decimal_point(void) +{ +#ifdef ENABLE_LOCALES + struct lconv *lconv = localeconv(); + return (unsigned char) lconv->decimal_point[0]; +#else + return '.'; +#endif +} + +typedef struct +{ + const unsigned char *content; + size_t length; + size_t offset; + size_t depth; /* How deeply nested (in arrays/objects) is the input at the current offset. */ + internal_hooks hooks; +} parse_buffer; + +/* check if the given size is left to read in a given parse buffer (starting with 1) */ +#define can_read(buffer, size) ((buffer != NULL) && (((buffer)->offset + size) <= (buffer)->length)) +/* check if the buffer can be accessed at the given index (starting with 0) */ +#define can_access_at_index(buffer, index) ((buffer != NULL) && (((buffer)->offset + index) < (buffer)->length)) +#define cannot_access_at_index(buffer, index) (!can_access_at_index(buffer, index)) +/* get a pointer to the buffer at the position */ +#define buffer_at_offset(buffer) ((buffer)->content + (buffer)->offset) + +#ifdef __CJSON_USE_INT64 +/* Parse the input text to generate a number, and populate the result into item. */ +static cJSON_bool parse_number(cJSON * const item, parse_buffer * const input_buffer) +{ + double number = 0; + long long integer = 0; + unsigned char *after_end = NULL; + unsigned char number_c_string[64]; + unsigned char decimal_point = get_decimal_point(); + size_t i = 0; + cJSON_bool is_integer = true; + + if ((input_buffer == NULL) || (input_buffer->content == NULL)) + { + return false; + } + + /* copy the number into a temporary buffer and replace '.' with the decimal point + * of the current locale (for strtod) + * This also takes care of '\0' not necessarily being available for marking the end of the input */ + for (i = 0; (i < (sizeof(number_c_string) - 1)) && can_access_at_index(input_buffer, i); i++) + { + switch (buffer_at_offset(input_buffer)[i]) + { + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + case '+': + case '-': + number_c_string[i] = buffer_at_offset(input_buffer)[i]; + break; + case 'e': + case 'E': + number_c_string[i] = buffer_at_offset(input_buffer)[i]; + is_integer = false; + break; + + case '.': + number_c_string[i] = decimal_point; + is_integer = false; + break; + + default: + goto loop_end; + } + } +loop_end: + number_c_string[i] = '\0'; + + /* use guard clause to process the int64 case first */ + if (is_integer) + { + /* for int64 values, set cJSON_IsInt64 */ + item->type = cJSON_Number | cJSON_IsInt64; + integer = strtoll((const char*)number_c_string, (char**)&after_end, 10); + if (number_c_string == after_end) + { + return false; /* parse_error */ + } + item->valueint = integer; + item->valuedouble = (double)integer; + goto parse_end; + } + + number = strtod((const char*)number_c_string, (char**)&after_end); + if (number_c_string == after_end) + { + return false; /* parse_error */ + } + + item->valuedouble = number; + + /* use saturation in case of overflow */ + if (number >= (double)LLONG_MAX) + { + item->valueint = LLONG_MAX; + } + else if (number <= (double)LLONG_MIN) + { + item->valueint = LLONG_MIN; + } + else + { + item->valueint = (long long)number; + } + + item->type = cJSON_Number; + +parse_end: + input_buffer->offset += (size_t)(after_end - number_c_string); + return true; +} +#else +/* Parse the input text to generate a number, and populate the result into item. */ +static cJSON_bool parse_number(cJSON * const item, parse_buffer * const input_buffer) +{ + double number = 0; + unsigned char *after_end = NULL; + unsigned char number_c_string[64]; + unsigned char decimal_point = get_decimal_point(); + size_t i = 0; + + if ((input_buffer == NULL) || (input_buffer->content == NULL)) + { + return false; + } + + /* copy the number into a temporary buffer and replace '.' with the decimal point + * of the current locale (for strtod) + * This also takes care of '\0' not necessarily being available for marking the end of the input */ + for (i = 0; (i < (sizeof(number_c_string) - 1)) && can_access_at_index(input_buffer, i); i++) + { + switch (buffer_at_offset(input_buffer)[i]) + { + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + case '+': + case '-': + case 'e': + case 'E': + number_c_string[i] = buffer_at_offset(input_buffer)[i]; + break; + + case '.': + number_c_string[i] = decimal_point; + break; + + default: + goto loop_end; + } + } +loop_end: + number_c_string[i] = '\0'; + + number = strtod((const char*)number_c_string, (char**)&after_end); + if (number_c_string == after_end) + { + return false; /* parse_error */ + } + + item->valuedouble = number; + + /* use saturation in case of overflow */ + if (number >= INT_MAX) + { + item->valueint = INT_MAX; + } + else if (number <= (double)INT_MIN) + { + item->valueint = INT_MIN; + } + else + { + item->valueint = (int)number; + } + + item->type = cJSON_Number; + + input_buffer->offset += (size_t)(after_end - number_c_string); + return true; +} +#endif /* __CJSON_USE_INT64 */ + +#ifdef __CJSON_USE_INT64 +CJSON_PUBLIC(long long) cJSON_SetInt64NumberValue(cJSON * const object, const long long integer) +{ + if (object == NULL) + { + return integer; + } + + /* check the type before setting values */ + if (!(object->type & cJSON_Number) || !(object->type & cJSON_IsInt64)) + { + return integer; + } + + object->valueint = integer; + object->valuedouble = (double)integer; + + return integer; +} +#endif /* __CJSON_USE_INT64 */ + +#ifdef __CJSON_USE_INT64 +/* note that double max(DBL_MAX) is bigger than long long max(LLONG_MAX) */ +CJSON_PUBLIC(double) cJSON_SetNumberHelper(cJSON *object, double number) +{ + if (number >= (double)LLONG_MAX) + { + object->valueint = LLONG_MAX; + } + else if (number <= (double)LLONG_MIN) + { + object->valueint = LLONG_MIN; + } + else + { + object->valueint = (long long)number; + } + + return object->valuedouble = number; +} +#else +/* don't ask me, but the original cJSON_SetNumberValue returns an integer or double */ +CJSON_PUBLIC(double) cJSON_SetNumberHelper(cJSON *object, double number) +{ + if (number >= INT_MAX) + { + object->valueint = INT_MAX; + } + else if (number <= (double)INT_MIN) + { + object->valueint = INT_MIN; + } + else + { + object->valueint = (int)number; + } + + return object->valuedouble = number; +} +#endif /* #ifdef __CJSON_USE_INT64 */ + +CJSON_PUBLIC(char*) cJSON_SetValuestring(cJSON *object, const char *valuestring) +{ + char *copy = NULL; + /* if object's type is not cJSON_String or is cJSON_IsReference, it should not set valuestring */ + if ((object == NULL) || !(object->type & cJSON_String) || (object->type & cJSON_IsReference)) + { + return NULL; + } + /* return NULL if the object is corrupted */ + if (object->valuestring == NULL || valuestring == NULL) + { + return NULL; + } + if (strlen(valuestring) <= strlen(object->valuestring)) + { + strcpy(object->valuestring, valuestring); + return object->valuestring; + } + copy = (char*) cJSON_strdup((const unsigned char*)valuestring, &global_hooks); + if (copy == NULL) + { + return NULL; + } + if (object->valuestring != NULL) + { + cJSON_free(object->valuestring); + } + object->valuestring = copy; + + return copy; +} + +typedef struct +{ + unsigned char *buffer; + size_t length; + size_t offset; + size_t depth; /* current nesting depth (for formatted printing) */ + cJSON_bool noalloc; + cJSON_bool format; /* is this print a formatted print */ + internal_hooks hooks; +} printbuffer; + +/* realloc printbuffer if necessary to have at least "needed" bytes more */ +static unsigned char* ensure(printbuffer * const p, size_t needed) +{ + unsigned char *newbuffer = NULL; + size_t newsize = 0; + + if ((p == NULL) || (p->buffer == NULL)) + { + return NULL; + } + + if ((p->length > 0) && (p->offset >= p->length)) + { + /* make sure that offset is valid */ + return NULL; + } + + if (needed > INT_MAX) + { + /* sizes bigger than INT_MAX are currently not supported */ + return NULL; + } + + needed += p->offset + 1; + if (needed <= p->length) + { + return p->buffer + p->offset; + } + + if (p->noalloc) { + return NULL; + } + + /* calculate new buffer size */ + if (needed > (INT_MAX / 2)) + { + /* overflow of int, use INT_MAX if possible */ + if (needed <= INT_MAX) + { + newsize = INT_MAX; + } + else + { + return NULL; + } + } + else + { + newsize = needed * 2; + } + + if (p->hooks.reallocate != NULL) + { + /* reallocate with realloc if available */ + newbuffer = (unsigned char*)p->hooks.reallocate(p->buffer, newsize); + if (newbuffer == NULL) + { + p->hooks.deallocate(p->buffer); + p->length = 0; + p->buffer = NULL; + + return NULL; + } + } + else + { + /* otherwise reallocate manually */ + newbuffer = (unsigned char*)p->hooks.allocate(newsize); + if (!newbuffer) + { + p->hooks.deallocate(p->buffer); + p->length = 0; + p->buffer = NULL; + + return NULL; + } + + memcpy(newbuffer, p->buffer, p->offset + 1); + p->hooks.deallocate(p->buffer); + } + p->length = newsize; + p->buffer = newbuffer; + + return newbuffer + p->offset; +} + +/* calculate the new length of the string in a printbuffer and update the offset */ +static void update_offset(printbuffer * const buffer) +{ + const unsigned char *buffer_pointer = NULL; + if ((buffer == NULL) || (buffer->buffer == NULL)) + { + return; + } + buffer_pointer = buffer->buffer + buffer->offset; + + buffer->offset += strlen((const char*)buffer_pointer); +} + +/* securely comparison of floating-point variables */ +static cJSON_bool compare_double(double a, double b) +{ + double maxVal = fabs(a) > fabs(b) ? fabs(a) : fabs(b); + return (fabs(a - b) <= maxVal * DBL_EPSILON); +} + +#ifdef __CJSON_USE_INT64 +/* Render the number nicely from the given item into a string. */ +static cJSON_bool print_number(const cJSON * const item, printbuffer * const output_buffer) +{ + unsigned char *output_pointer = NULL; + double d = item->valuedouble; + long long integer = item->valueint; + int length = 0; + size_t i = 0; + unsigned char number_buffer[26] = {0}; /* temporary buffer to print the number into */ + unsigned char decimal_point = get_decimal_point(); + double test = 0.0; + + if (output_buffer == NULL) + { + return false; + } + + if (item->type & cJSON_IsInt64) + { + /* use lld to print the long long integer */ + length = sprintf((char*)number_buffer, "%lld", integer); + } + else /* item->type == cJSON_Number */ + { + /* This checks for NaN and Infinity */ + if (isnan(d) || isinf(d)) + { + length = sprintf((char*)number_buffer, "null"); + } + else + { + /* Try 15 decimal places of precision to avoid nonsignificant nonzero digits */ + length = sprintf((char*)number_buffer, "%1.15g", d); + + /* Check whether the original double can be recovered */ + if ((sscanf((char*)number_buffer, "%lg", &test) != 1) || !compare_double((double)test, d)) + { + /* If not, print with 17 decimal places of precision */ + length = sprintf((char*)number_buffer, "%1.17g", d); + } + } + } + + /* sprintf failed or buffer overrun occurred */ + if ((length < 0) || (length > (int)(sizeof(number_buffer) - 1))) + { + return false; + } + + /* reserve appropriate space in the output */ + output_pointer = ensure(output_buffer, (size_t)length + sizeof("")); + if (output_pointer == NULL) + { + return false; + } + + /* copy the printed number to the output and replace locale + * dependent decimal point with '.' */ + for (i = 0; i < ((size_t)length); i++) + { + if (number_buffer[i] == decimal_point) + { + output_pointer[i] = '.'; + continue; + } + + output_pointer[i] = number_buffer[i]; + } + output_pointer[i] = '\0'; + + output_buffer->offset += (size_t)length; + + return true; +} +#else +/* Render the number nicely from the given item into a string. */ +static cJSON_bool print_number(const cJSON * const item, printbuffer * const output_buffer) +{ + unsigned char *output_pointer = NULL; + double d = item->valuedouble; + int length = 0; + size_t i = 0; + unsigned char number_buffer[26] = {0}; /* temporary buffer to print the number into */ + unsigned char decimal_point = get_decimal_point(); + double test = 0.0; + + if (output_buffer == NULL) + { + return false; + } + + /* This checks for NaN and Infinity */ + if (isnan(d) || isinf(d)) + { + length = sprintf((char*)number_buffer, "null"); + } + else if(d == (double)item->valueint) + { + length = sprintf((char*)number_buffer, "%d", item->valueint); + } + else + { + /* Try 15 decimal places of precision to avoid nonsignificant nonzero digits */ + length = sprintf((char*)number_buffer, "%1.15g", d); + + /* Check whether the original double can be recovered */ + if ((sscanf((char*)number_buffer, "%lg", &test) != 1) || !compare_double((double)test, d)) + { + /* If not, print with 17 decimal places of precision */ + length = sprintf((char*)number_buffer, "%1.17g", d); + } + } + + /* sprintf failed or buffer overrun occurred */ + if ((length < 0) || (length > (int)(sizeof(number_buffer) - 1))) + { + return false; + } + + /* reserve appropriate space in the output */ + output_pointer = ensure(output_buffer, (size_t)length + sizeof("")); + if (output_pointer == NULL) + { + return false; + } + + /* copy the printed number to the output and replace locale + * dependent decimal point with '.' */ + for (i = 0; i < ((size_t)length); i++) + { + if (number_buffer[i] == decimal_point) + { + output_pointer[i] = '.'; + continue; + } + + output_pointer[i] = number_buffer[i]; + } + output_pointer[i] = '\0'; + + output_buffer->offset += (size_t)length; + + return true; +} +#endif /* __CJSON_USE_INT64 */ + +/* parse 4 digit hexadecimal number */ +static unsigned parse_hex4(const unsigned char * const input) +{ + unsigned int h = 0; + size_t i = 0; + + for (i = 0; i < 4; i++) + { + /* parse digit */ + if ((input[i] >= '0') && (input[i] <= '9')) + { + h += (unsigned int) input[i] - '0'; + } + else if ((input[i] >= 'A') && (input[i] <= 'F')) + { + h += (unsigned int) 10 + input[i] - 'A'; + } + else if ((input[i] >= 'a') && (input[i] <= 'f')) + { + h += (unsigned int) 10 + input[i] - 'a'; + } + else /* invalid */ + { + return 0; + } + + if (i < 3) + { + /* shift left to make place for the next nibble */ + h = h << 4; + } + } + + return h; +} + +/* converts a UTF-16 literal to UTF-8 + * A literal can be one or two sequences of the form \uXXXX */ +static unsigned char utf16_literal_to_utf8(const unsigned char * const input_pointer, const unsigned char * const input_end, unsigned char **output_pointer) +{ + long unsigned int codepoint = 0; + unsigned int first_code = 0; + const unsigned char *first_sequence = input_pointer; + unsigned char utf8_length = 0; + unsigned char utf8_position = 0; + unsigned char sequence_length = 0; + unsigned char first_byte_mark = 0; + + if ((input_end - first_sequence) < 6) + { + /* input ends unexpectedly */ + goto fail; + } + + /* get the first utf16 sequence */ + first_code = parse_hex4(first_sequence + 2); + + /* check that the code is valid */ + if (((first_code >= 0xDC00) && (first_code <= 0xDFFF))) + { + goto fail; + } + + /* UTF16 surrogate pair */ + if ((first_code >= 0xD800) && (first_code <= 0xDBFF)) + { + const unsigned char *second_sequence = first_sequence + 6; + unsigned int second_code = 0; + sequence_length = 12; /* \uXXXX\uXXXX */ + + if ((input_end - second_sequence) < 6) + { + /* input ends unexpectedly */ + goto fail; + } + + if ((second_sequence[0] != '\\') || (second_sequence[1] != 'u')) + { + /* missing second half of the surrogate pair */ + goto fail; + } + + /* get the second utf16 sequence */ + second_code = parse_hex4(second_sequence + 2); + /* check that the code is valid */ + if ((second_code < 0xDC00) || (second_code > 0xDFFF)) + { + /* invalid second half of the surrogate pair */ + goto fail; + } + + + /* calculate the unicode codepoint from the surrogate pair */ + codepoint = 0x10000 + (((first_code & 0x3FF) << 10) | (second_code & 0x3FF)); + } + else + { + sequence_length = 6; /* \uXXXX */ + codepoint = first_code; + } + + /* encode as UTF-8 + * takes at maximum 4 bytes to encode: + * 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx */ + if (codepoint < 0x80) + { + /* normal ascii, encoding 0xxxxxxx */ + utf8_length = 1; + } + else if (codepoint < 0x800) + { + /* two bytes, encoding 110xxxxx 10xxxxxx */ + utf8_length = 2; + first_byte_mark = 0xC0; /* 11000000 */ + } + else if (codepoint < 0x10000) + { + /* three bytes, encoding 1110xxxx 10xxxxxx 10xxxxxx */ + utf8_length = 3; + first_byte_mark = 0xE0; /* 11100000 */ + } + else if (codepoint <= 0x10FFFF) + { + /* four bytes, encoding 1110xxxx 10xxxxxx 10xxxxxx 10xxxxxx */ + utf8_length = 4; + first_byte_mark = 0xF0; /* 11110000 */ + } + else + { + /* invalid unicode codepoint */ + goto fail; + } + + /* encode as utf8 */ + for (utf8_position = (unsigned char)(utf8_length - 1); utf8_position > 0; utf8_position--) + { + /* 10xxxxxx */ + (*output_pointer)[utf8_position] = (unsigned char)((codepoint | 0x80) & 0xBF); + codepoint >>= 6; + } + /* encode first byte */ + if (utf8_length > 1) + { + (*output_pointer)[0] = (unsigned char)((codepoint | first_byte_mark) & 0xFF); + } + else + { + (*output_pointer)[0] = (unsigned char)(codepoint & 0x7F); + } + + *output_pointer += utf8_length; + + return sequence_length; + +fail: + return 0; +} + +/* Parse the input text into an unescaped cinput, and populate item. */ +static cJSON_bool parse_string(cJSON * const item, parse_buffer * const input_buffer) +{ + const unsigned char *input_pointer = buffer_at_offset(input_buffer) + 1; + const unsigned char *input_end = buffer_at_offset(input_buffer) + 1; + unsigned char *output_pointer = NULL; + unsigned char *output = NULL; + + /* not a string */ + if (buffer_at_offset(input_buffer)[0] != '\"') + { + goto fail; + } + + { + /* calculate approximate size of the output (overestimate) */ + size_t allocation_length = 0; + size_t skipped_bytes = 0; + while (((size_t)(input_end - input_buffer->content) < input_buffer->length) && (*input_end != '\"')) + { + /* is escape sequence */ + if (input_end[0] == '\\') + { + if ((size_t)(input_end + 1 - input_buffer->content) >= input_buffer->length) + { + /* prevent buffer overflow when last input character is a backslash */ + goto fail; + } + skipped_bytes++; + input_end++; + } + input_end++; + } + if (((size_t)(input_end - input_buffer->content) >= input_buffer->length) || (*input_end != '\"')) + { + goto fail; /* string ended unexpectedly */ + } + + /* This is at most how much we need for the output */ + allocation_length = (size_t) (input_end - buffer_at_offset(input_buffer)) - skipped_bytes; + output = (unsigned char*)input_buffer->hooks.allocate(allocation_length + sizeof("")); + if (output == NULL) + { + goto fail; /* allocation failure */ + } + } + + output_pointer = output; + /* loop through the string literal */ + while (input_pointer < input_end) + { + if (*input_pointer != '\\') + { + *output_pointer++ = *input_pointer++; + } + /* escape sequence */ + else + { + unsigned char sequence_length = 2; + if ((input_end - input_pointer) < 1) + { + goto fail; + } + + switch (input_pointer[1]) + { + case 'b': + *output_pointer++ = '\b'; + break; + case 'f': + *output_pointer++ = '\f'; + break; + case 'n': + *output_pointer++ = '\n'; + break; + case 'r': + *output_pointer++ = '\r'; + break; + case 't': + *output_pointer++ = '\t'; + break; + case '\"': + case '\\': + case '/': + *output_pointer++ = input_pointer[1]; + break; + + /* UTF-16 literal */ + case 'u': + sequence_length = utf16_literal_to_utf8(input_pointer, input_end, &output_pointer); + if (sequence_length == 0) + { + /* failed to convert UTF16-literal to UTF-8 */ + goto fail; + } + break; + + default: + goto fail; + } + input_pointer += sequence_length; + } + } + + /* zero terminate the output */ + *output_pointer = '\0'; + + item->type = cJSON_String; + item->valuestring = (char*)output; + + input_buffer->offset = (size_t) (input_end - input_buffer->content); + input_buffer->offset++; + + return true; + +fail: + if (output != NULL) + { + input_buffer->hooks.deallocate(output); + } + + if (input_pointer != NULL) + { + input_buffer->offset = (size_t)(input_pointer - input_buffer->content); + } + + return false; +} + +/* Render the cstring provided to an escaped version that can be printed. */ +static cJSON_bool print_string_ptr(const unsigned char * const input, printbuffer * const output_buffer) +{ + const unsigned char *input_pointer = NULL; + unsigned char *output = NULL; + unsigned char *output_pointer = NULL; + size_t output_length = 0; + /* numbers of additional characters needed for escaping */ + size_t escape_characters = 0; + + if (output_buffer == NULL) + { + return false; + } + + /* empty string */ + if (input == NULL) + { + output = ensure(output_buffer, sizeof("\"\"")); + if (output == NULL) + { + return false; + } + strcpy((char*)output, "\"\""); + + return true; + } + + /* set "flag" to 1 if something needs to be escaped */ + for (input_pointer = input; *input_pointer; input_pointer++) + { + switch (*input_pointer) + { + case '\"': + case '\\': + case '\b': + case '\f': + case '\n': + case '\r': + case '\t': + /* one character escape sequence */ + escape_characters++; + break; + default: + if (*input_pointer < 32) + { + /* UTF-16 escape sequence uXXXX */ + escape_characters += 5; + } + break; + } + } + output_length = (size_t)(input_pointer - input) + escape_characters; + + output = ensure(output_buffer, output_length + sizeof("\"\"")); + if (output == NULL) + { + return false; + } + + /* no characters have to be escaped */ + if (escape_characters == 0) + { + output[0] = '\"'; + memcpy(output + 1, input, output_length); + output[output_length + 1] = '\"'; + output[output_length + 2] = '\0'; + + return true; + } + + output[0] = '\"'; + output_pointer = output + 1; + /* copy the string */ + for (input_pointer = input; *input_pointer != '\0'; (void)input_pointer++, output_pointer++) + { + if ((*input_pointer > 31) && (*input_pointer != '\"') && (*input_pointer != '\\')) + { + /* normal character, copy */ + *output_pointer = *input_pointer; + } + else + { + /* character needs to be escaped */ + *output_pointer++ = '\\'; + switch (*input_pointer) + { + case '\\': + *output_pointer = '\\'; + break; + case '\"': + *output_pointer = '\"'; + break; + case '\b': + *output_pointer = 'b'; + break; + case '\f': + *output_pointer = 'f'; + break; + case '\n': + *output_pointer = 'n'; + break; + case '\r': + *output_pointer = 'r'; + break; + case '\t': + *output_pointer = 't'; + break; + default: + /* escape and print as unicode codepoint */ + sprintf((char*)output_pointer, "u%04x", *input_pointer); + output_pointer += 4; + break; + } + } + } + output[output_length + 1] = '\"'; + output[output_length + 2] = '\0'; + + return true; +} + +/* Invoke print_string_ptr (which is useful) on an item. */ +static cJSON_bool print_string(const cJSON * const item, printbuffer * const p) +{ + return print_string_ptr((unsigned char*)item->valuestring, p); +} + +/* Predeclare these prototypes. */ +static cJSON_bool parse_value(cJSON * const item, parse_buffer * const input_buffer); +static cJSON_bool print_value(const cJSON * const item, printbuffer * const output_buffer); +static cJSON_bool parse_array(cJSON * const item, parse_buffer * const input_buffer); +static cJSON_bool print_array(const cJSON * const item, printbuffer * const output_buffer); +static cJSON_bool parse_object(cJSON * const item, parse_buffer * const input_buffer); +static cJSON_bool print_object(const cJSON * const item, printbuffer * const output_buffer); + +/* Utility to jump whitespace and cr/lf */ +static parse_buffer *buffer_skip_whitespace(parse_buffer * const buffer) +{ + if ((buffer == NULL) || (buffer->content == NULL)) + { + return NULL; + } + + if (cannot_access_at_index(buffer, 0)) + { + return buffer; + } + + while (can_access_at_index(buffer, 0) && (buffer_at_offset(buffer)[0] <= 32)) + { + buffer->offset++; + } + + if (buffer->offset == buffer->length) + { + buffer->offset--; + } + + return buffer; +} + +/* skip the UTF-8 BOM (byte order mark) if it is at the beginning of a buffer */ +static parse_buffer *skip_utf8_bom(parse_buffer * const buffer) +{ + if ((buffer == NULL) || (buffer->content == NULL) || (buffer->offset != 0)) + { + return NULL; + } + + if (can_access_at_index(buffer, 4) && (strncmp((const char*)buffer_at_offset(buffer), "\xEF\xBB\xBF", 3) == 0)) + { + buffer->offset += 3; + } + + return buffer; +} + +CJSON_PUBLIC(cJSON *) cJSON_ParseWithOpts(const char *value, const char **return_parse_end, cJSON_bool require_null_terminated) +{ + size_t buffer_length; + + if (NULL == value) + { + return NULL; + } + + /* Adding null character size due to require_null_terminated. */ + buffer_length = strlen(value) + sizeof(""); + + return cJSON_ParseWithLengthOpts(value, buffer_length, return_parse_end, require_null_terminated); +} + +/* Parse an object - create a new root, and populate. */ +CJSON_PUBLIC(cJSON *) cJSON_ParseWithLengthOpts(const char *value, size_t buffer_length, const char **return_parse_end, cJSON_bool require_null_terminated) +{ + parse_buffer buffer = { 0, 0, 0, 0, { 0, 0, 0 } }; + cJSON *item = NULL; + + /* reset error position */ + global_error.json = NULL; + global_error.position = 0; + + if (value == NULL || 0 == buffer_length) + { + goto fail; + } + + buffer.content = (const unsigned char*)value; + buffer.length = buffer_length; + buffer.offset = 0; + buffer.hooks = global_hooks; + + item = cJSON_New_Item(&global_hooks); + if (item == NULL) /* memory fail */ + { + goto fail; + } + + if (!parse_value(item, buffer_skip_whitespace(skip_utf8_bom(&buffer)))) + { + /* parse failure. ep is set. */ + goto fail; + } + + /* if we require null-terminated JSON without appended garbage, skip and then check for a null terminator */ + if (require_null_terminated) + { + buffer_skip_whitespace(&buffer); + if ((buffer.offset >= buffer.length) || buffer_at_offset(&buffer)[0] != '\0') + { + goto fail; + } + } + if (return_parse_end) + { + *return_parse_end = (const char*)buffer_at_offset(&buffer); + } + + return item; + +fail: + if (item != NULL) + { + cJSON_Delete(item); + } + + if (value != NULL) + { + error local_error; + local_error.json = (const unsigned char*)value; + local_error.position = 0; + + if (buffer.offset < buffer.length) + { + local_error.position = buffer.offset; + } + else if (buffer.length > 0) + { + local_error.position = buffer.length - 1; + } + + if (return_parse_end != NULL) + { + *return_parse_end = (const char*)local_error.json + local_error.position; + } + + global_error = local_error; + } + + return NULL; +} + +/* Default options for cJSON_Parse */ +CJSON_PUBLIC(cJSON *) cJSON_Parse(const char *value) +{ + return cJSON_ParseWithOpts(value, 0, 0); +} + +CJSON_PUBLIC(cJSON *) cJSON_ParseWithLength(const char *value, size_t buffer_length) +{ + return cJSON_ParseWithLengthOpts(value, buffer_length, 0, 0); +} + +#define cjson_min(a, b) (((a) < (b)) ? (a) : (b)) + +static unsigned char *print(const cJSON * const item, cJSON_bool format, const internal_hooks * const hooks) +{ + static const size_t default_buffer_size = 256; + printbuffer buffer[1]; + unsigned char *printed = NULL; + + memset(buffer, 0, sizeof(buffer)); + + /* create buffer */ + buffer->buffer = (unsigned char*) hooks->allocate(default_buffer_size); + buffer->length = default_buffer_size; + buffer->format = format; + buffer->hooks = *hooks; + if (buffer->buffer == NULL) + { + goto fail; + } + + /* print the value */ + if (!print_value(item, buffer)) + { + goto fail; + } + update_offset(buffer); + + /* check if reallocate is available */ + if (hooks->reallocate != NULL) + { + printed = (unsigned char*) hooks->reallocate(buffer->buffer, buffer->offset + 1); + if (printed == NULL) { + goto fail; + } + buffer->buffer = NULL; + } + else /* otherwise copy the JSON over to a new buffer */ + { + printed = (unsigned char*) hooks->allocate(buffer->offset + 1); + if (printed == NULL) + { + goto fail; + } + memcpy(printed, buffer->buffer, cjson_min(buffer->length, buffer->offset + 1)); + printed[buffer->offset] = '\0'; /* just to be sure */ + + /* free the buffer */ + hooks->deallocate(buffer->buffer); + } + + return printed; + +fail: + if (buffer->buffer != NULL) + { + hooks->deallocate(buffer->buffer); + } + + if (printed != NULL) + { + hooks->deallocate(printed); + } + + return NULL; +} + +/* Render a cJSON item/entity/structure to text. */ +CJSON_PUBLIC(char *) cJSON_Print(const cJSON *item) +{ + return (char*)print(item, true, &global_hooks); +} + +CJSON_PUBLIC(char *) cJSON_PrintUnformatted(const cJSON *item) +{ + return (char*)print(item, false, &global_hooks); +} + +CJSON_PUBLIC(char *) cJSON_PrintBuffered(const cJSON *item, int prebuffer, cJSON_bool fmt) +{ + printbuffer p = { 0, 0, 0, 0, 0, 0, { 0, 0, 0 } }; + + if (prebuffer < 0) + { + return NULL; + } + + p.buffer = (unsigned char*)global_hooks.allocate((size_t)prebuffer); + if (!p.buffer) + { + return NULL; + } + + p.length = (size_t)prebuffer; + p.offset = 0; + p.noalloc = false; + p.format = fmt; + p.hooks = global_hooks; + + if (!print_value(item, &p)) + { + global_hooks.deallocate(p.buffer); + return NULL; + } + + return (char*)p.buffer; +} + +CJSON_PUBLIC(cJSON_bool) cJSON_PrintPreallocated(cJSON *item, char *buffer, const int length, const cJSON_bool format) +{ + printbuffer p = { 0, 0, 0, 0, 0, 0, { 0, 0, 0 } }; + + if ((length < 0) || (buffer == NULL)) + { + return false; + } + + p.buffer = (unsigned char*)buffer; + p.length = (size_t)length; + p.offset = 0; + p.noalloc = true; + p.format = format; + p.hooks = global_hooks; + + return print_value(item, &p); +} + +/* Parser core - when encountering text, process appropriately. */ +static cJSON_bool parse_value(cJSON * const item, parse_buffer * const input_buffer) +{ + if ((input_buffer == NULL) || (input_buffer->content == NULL)) + { + return false; /* no input */ + } + + /* parse the different types of values */ + /* null */ + if (can_read(input_buffer, 4) && (strncmp((const char*)buffer_at_offset(input_buffer), "null", 4) == 0)) + { + item->type = cJSON_NULL; + input_buffer->offset += 4; + return true; + } + /* false */ + if (can_read(input_buffer, 5) && (strncmp((const char*)buffer_at_offset(input_buffer), "false", 5) == 0)) + { + item->type = cJSON_False; + input_buffer->offset += 5; + return true; + } + /* true */ + if (can_read(input_buffer, 4) && (strncmp((const char*)buffer_at_offset(input_buffer), "true", 4) == 0)) + { + item->type = cJSON_True; + item->valueint = 1; + input_buffer->offset += 4; + return true; + } + /* string */ + if (can_access_at_index(input_buffer, 0) && (buffer_at_offset(input_buffer)[0] == '\"')) + { + return parse_string(item, input_buffer); + } + /* number */ + if (can_access_at_index(input_buffer, 0) && ((buffer_at_offset(input_buffer)[0] == '-') || ((buffer_at_offset(input_buffer)[0] >= '0') && (buffer_at_offset(input_buffer)[0] <= '9')))) + { + return parse_number(item, input_buffer); + } + /* array */ + if (can_access_at_index(input_buffer, 0) && (buffer_at_offset(input_buffer)[0] == '[')) + { + return parse_array(item, input_buffer); + } + /* object */ + if (can_access_at_index(input_buffer, 0) && (buffer_at_offset(input_buffer)[0] == '{')) + { + return parse_object(item, input_buffer); + } + + return false; +} + +/* Render a value to text. */ +static cJSON_bool print_value(const cJSON * const item, printbuffer * const output_buffer) +{ + unsigned char *output = NULL; + + if ((item == NULL) || (output_buffer == NULL)) + { + return false; + } + + switch ((item->type) & 0xFF) + { + case cJSON_NULL: + output = ensure(output_buffer, 5); + if (output == NULL) + { + return false; + } + strcpy((char*)output, "null"); + return true; + + case cJSON_False: + output = ensure(output_buffer, 6); + if (output == NULL) + { + return false; + } + strcpy((char*)output, "false"); + return true; + + case cJSON_True: + output = ensure(output_buffer, 5); + if (output == NULL) + { + return false; + } + strcpy((char*)output, "true"); + return true; + + case cJSON_Number: + return print_number(item, output_buffer); + + case cJSON_Raw: + { + size_t raw_length = 0; + if (item->valuestring == NULL) + { + return false; + } + + raw_length = strlen(item->valuestring) + sizeof(""); + output = ensure(output_buffer, raw_length); + if (output == NULL) + { + return false; + } + memcpy(output, item->valuestring, raw_length); + return true; + } + + case cJSON_String: + return print_string(item, output_buffer); + + case cJSON_Array: + return print_array(item, output_buffer); + + case cJSON_Object: + return print_object(item, output_buffer); + + default: + return false; + } +} + +/* Build an array from input text. */ +static cJSON_bool parse_array(cJSON * const item, parse_buffer * const input_buffer) +{ + cJSON *head = NULL; /* head of the linked list */ + cJSON *current_item = NULL; + + if (input_buffer->depth >= CJSON_NESTING_LIMIT) + { + return false; /* to deeply nested */ + } + input_buffer->depth++; + + if (buffer_at_offset(input_buffer)[0] != '[') + { + /* not an array */ + goto fail; + } + + input_buffer->offset++; + buffer_skip_whitespace(input_buffer); + if (can_access_at_index(input_buffer, 0) && (buffer_at_offset(input_buffer)[0] == ']')) + { + /* empty array */ + goto success; + } + + /* check if we skipped to the end of the buffer */ + if (cannot_access_at_index(input_buffer, 0)) + { + input_buffer->offset--; + goto fail; + } + + /* step back to character in front of the first element */ + input_buffer->offset--; + /* loop through the comma separated array elements */ + do + { + /* allocate next item */ + cJSON *new_item = cJSON_New_Item(&(input_buffer->hooks)); + if (new_item == NULL) + { + goto fail; /* allocation failure */ + } + + /* attach next item to list */ + if (head == NULL) + { + /* start the linked list */ + current_item = head = new_item; + } + else + { + /* add to the end and advance */ + current_item->next = new_item; + new_item->prev = current_item; + current_item = new_item; + } + + /* parse next value */ + input_buffer->offset++; + buffer_skip_whitespace(input_buffer); + if (!parse_value(current_item, input_buffer)) + { + goto fail; /* failed to parse value */ + } + buffer_skip_whitespace(input_buffer); + } + while (can_access_at_index(input_buffer, 0) && (buffer_at_offset(input_buffer)[0] == ',')); + + if (cannot_access_at_index(input_buffer, 0) || buffer_at_offset(input_buffer)[0] != ']') + { + goto fail; /* expected end of array */ + } + +success: + input_buffer->depth--; + + if (head != NULL) { + head->prev = current_item; + } + + item->type = cJSON_Array; + item->child = head; + + input_buffer->offset++; + + return true; + +fail: + if (head != NULL) + { + cJSON_Delete(head); + } + + return false; +} + +/* Render an array to text */ +static cJSON_bool print_array(const cJSON * const item, printbuffer * const output_buffer) +{ + unsigned char *output_pointer = NULL; + size_t length = 0; + cJSON *current_element = item->child; + + if (output_buffer == NULL) + { + return false; + } + + /* Compose the output array. */ + /* opening square bracket */ + output_pointer = ensure(output_buffer, 1); + if (output_pointer == NULL) + { + return false; + } + + *output_pointer = '['; + output_buffer->offset++; + output_buffer->depth++; + + while (current_element != NULL) + { + if (!print_value(current_element, output_buffer)) + { + return false; + } + update_offset(output_buffer); + if (current_element->next) + { + length = (size_t) (output_buffer->format ? 2 : 1); + output_pointer = ensure(output_buffer, length + 1); + if (output_pointer == NULL) + { + return false; + } + *output_pointer++ = ','; + if(output_buffer->format) + { + *output_pointer++ = ' '; + } + *output_pointer = '\0'; + output_buffer->offset += length; + } + current_element = current_element->next; + } + + output_pointer = ensure(output_buffer, 2); + if (output_pointer == NULL) + { + return false; + } + *output_pointer++ = ']'; + *output_pointer = '\0'; + output_buffer->depth--; + + return true; +} + +/* Build an object from the text. */ +static cJSON_bool parse_object(cJSON * const item, parse_buffer * const input_buffer) +{ + cJSON *head = NULL; /* linked list head */ + cJSON *current_item = NULL; + + if (input_buffer->depth >= CJSON_NESTING_LIMIT) + { + return false; /* to deeply nested */ + } + input_buffer->depth++; + + if (cannot_access_at_index(input_buffer, 0) || (buffer_at_offset(input_buffer)[0] != '{')) + { + goto fail; /* not an object */ + } + + input_buffer->offset++; + buffer_skip_whitespace(input_buffer); + if (can_access_at_index(input_buffer, 0) && (buffer_at_offset(input_buffer)[0] == '}')) + { + goto success; /* empty object */ + } + + /* check if we skipped to the end of the buffer */ + if (cannot_access_at_index(input_buffer, 0)) + { + input_buffer->offset--; + goto fail; + } + + /* step back to character in front of the first element */ + input_buffer->offset--; + /* loop through the comma separated array elements */ + do + { + /* allocate next item */ + cJSON *new_item = cJSON_New_Item(&(input_buffer->hooks)); + if (new_item == NULL) + { + goto fail; /* allocation failure */ + } + + /* attach next item to list */ + if (head == NULL) + { + /* start the linked list */ + current_item = head = new_item; + } + else + { + /* add to the end and advance */ + current_item->next = new_item; + new_item->prev = current_item; + current_item = new_item; + } + + if (cannot_access_at_index(input_buffer, 1)) + { + goto fail; /* nothing comes after the comma */ + } + + /* parse the name of the child */ + input_buffer->offset++; + buffer_skip_whitespace(input_buffer); + if (!parse_string(current_item, input_buffer)) + { + goto fail; /* failed to parse name */ + } + buffer_skip_whitespace(input_buffer); + + /* swap valuestring and string, because we parsed the name */ + current_item->string = current_item->valuestring; + current_item->valuestring = NULL; + + if (cannot_access_at_index(input_buffer, 0) || (buffer_at_offset(input_buffer)[0] != ':')) + { + goto fail; /* invalid object */ + } + + /* parse the value */ + input_buffer->offset++; + buffer_skip_whitespace(input_buffer); + if (!parse_value(current_item, input_buffer)) + { + goto fail; /* failed to parse value */ + } + buffer_skip_whitespace(input_buffer); + } + while (can_access_at_index(input_buffer, 0) && (buffer_at_offset(input_buffer)[0] == ',')); + + if (cannot_access_at_index(input_buffer, 0) || (buffer_at_offset(input_buffer)[0] != '}')) + { + goto fail; /* expected end of object */ + } + +success: + input_buffer->depth--; + + if (head != NULL) { + head->prev = current_item; + } + + item->type = cJSON_Object; + item->child = head; + + input_buffer->offset++; + return true; + +fail: + if (head != NULL) + { + cJSON_Delete(head); + } + + return false; +} + +/* Render an object to text. */ +static cJSON_bool print_object(const cJSON * const item, printbuffer * const output_buffer) +{ + unsigned char *output_pointer = NULL; + size_t length = 0; + cJSON *current_item = item->child; + + if (output_buffer == NULL) + { + return false; + } + + /* Compose the output: */ + length = (size_t) (output_buffer->format ? 2 : 1); /* fmt: {\n */ + output_pointer = ensure(output_buffer, length + 1); + if (output_pointer == NULL) + { + return false; + } + + *output_pointer++ = '{'; + output_buffer->depth++; + if (output_buffer->format) + { + *output_pointer++ = '\n'; + } + output_buffer->offset += length; + + while (current_item) + { + if (output_buffer->format) + { + size_t i; + output_pointer = ensure(output_buffer, output_buffer->depth); + if (output_pointer == NULL) + { + return false; + } + for (i = 0; i < output_buffer->depth; i++) + { + *output_pointer++ = '\t'; + } + output_buffer->offset += output_buffer->depth; + } + + /* print key */ + if (!print_string_ptr((unsigned char*)current_item->string, output_buffer)) + { + return false; + } + update_offset(output_buffer); + + length = (size_t) (output_buffer->format ? 2 : 1); + output_pointer = ensure(output_buffer, length); + if (output_pointer == NULL) + { + return false; + } + *output_pointer++ = ':'; + if (output_buffer->format) + { + *output_pointer++ = '\t'; + } + output_buffer->offset += length; + + /* print value */ + if (!print_value(current_item, output_buffer)) + { + return false; + } + update_offset(output_buffer); + + /* print comma if not last */ + length = ((size_t)(output_buffer->format ? 1 : 0) + (size_t)(current_item->next ? 1 : 0)); + output_pointer = ensure(output_buffer, length + 1); + if (output_pointer == NULL) + { + return false; + } + if (current_item->next) + { + *output_pointer++ = ','; + } + + if (output_buffer->format) + { + *output_pointer++ = '\n'; + } + *output_pointer = '\0'; + output_buffer->offset += length; + + current_item = current_item->next; + } + + output_pointer = ensure(output_buffer, output_buffer->format ? (output_buffer->depth + 1) : 2); + if (output_pointer == NULL) + { + return false; + } + if (output_buffer->format) + { + size_t i; + for (i = 0; i < (output_buffer->depth - 1); i++) + { + *output_pointer++ = '\t'; + } + } + *output_pointer++ = '}'; + *output_pointer = '\0'; + output_buffer->depth--; + + return true; +} + +/* Get Array size/item / object item. */ +CJSON_PUBLIC(int) cJSON_GetArraySize(const cJSON *array) +{ + cJSON *child = NULL; + size_t size = 0; + + if (array == NULL) + { + return 0; + } + + child = array->child; + + while(child != NULL) + { + size++; + child = child->next; + } + + /* FIXME: Can overflow here. Cannot be fixed without breaking the API */ + + return (int)size; +} + +static cJSON* get_array_item(const cJSON *array, size_t index) +{ + cJSON *current_child = NULL; + + if (array == NULL) + { + return NULL; + } + + current_child = array->child; + while ((current_child != NULL) && (index > 0)) + { + index--; + current_child = current_child->next; + } + + return current_child; +} + +CJSON_PUBLIC(cJSON *) cJSON_GetArrayItem(const cJSON *array, int index) +{ + if (index < 0) + { + return NULL; + } + + return get_array_item(array, (size_t)index); +} + +static cJSON *get_object_item(const cJSON * const object, const char * const name, const cJSON_bool case_sensitive) +{ + cJSON *current_element = NULL; + + if ((object == NULL) || (name == NULL)) + { + return NULL; + } + + current_element = object->child; + if (case_sensitive) + { + while ((current_element != NULL) && (current_element->string != NULL) && (strcmp(name, current_element->string) != 0)) + { + current_element = current_element->next; + } + } + else + { + while ((current_element != NULL) && (case_insensitive_strcmp((const unsigned char*)name, (const unsigned char*)(current_element->string)) != 0)) + { + current_element = current_element->next; + } + } + + if ((current_element == NULL) || (current_element->string == NULL)) { + return NULL; + } + + return current_element; +} + +CJSON_PUBLIC(cJSON *) cJSON_GetObjectItem(const cJSON * const object, const char * const string) +{ + return get_object_item(object, string, false); +} + +CJSON_PUBLIC(cJSON *) cJSON_GetObjectItemCaseSensitive(const cJSON * const object, const char * const string) +{ + return get_object_item(object, string, true); +} + +CJSON_PUBLIC(cJSON_bool) cJSON_HasObjectItem(const cJSON *object, const char *string) +{ + return cJSON_GetObjectItem(object, string) ? 1 : 0; +} + +/* Utility for array list handling. */ +static void suffix_object(cJSON *prev, cJSON *item) +{ + prev->next = item; + item->prev = prev; +} + +/* Utility for handling references. */ +static cJSON *create_reference(const cJSON *item, const internal_hooks * const hooks) +{ + cJSON *reference = NULL; + if (item == NULL) + { + return NULL; + } + + reference = cJSON_New_Item(hooks); + if (reference == NULL) + { + return NULL; + } + + memcpy(reference, item, sizeof(cJSON)); + reference->string = NULL; + reference->type |= cJSON_IsReference; + reference->next = reference->prev = NULL; + return reference; +} + +static cJSON_bool add_item_to_array(cJSON *array, cJSON *item) +{ + cJSON *child = NULL; + + if ((item == NULL) || (array == NULL) || (array == item)) + { + return false; + } + + child = array->child; + /* + * To find the last item in array quickly, we use prev in array + */ + if (child == NULL) + { + /* list is empty, start new one */ + array->child = item; + item->prev = item; + item->next = NULL; + } + else + { + /* append to the end */ + if (child->prev) + { + suffix_object(child->prev, item); + array->child->prev = item; + } + } + + return true; +} + +/* Add item to array/object. */ +CJSON_PUBLIC(cJSON_bool) cJSON_AddItemToArray(cJSON *array, cJSON *item) +{ + return add_item_to_array(array, item); +} + +#if defined(__clang__) || (defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 5)))) + #pragma GCC diagnostic push +#endif +#ifdef __GNUC__ +#pragma GCC diagnostic ignored "-Wcast-qual" +#endif +/* helper function to cast away const */ +static void* cast_away_const(const void* string) +{ + return (void*)string; +} +#if defined(__clang__) || (defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 5)))) + #pragma GCC diagnostic pop +#endif + + +static cJSON_bool add_item_to_object(cJSON * const object, const char * const string, cJSON * const item, const internal_hooks * const hooks, const cJSON_bool constant_key) +{ + char *new_key = NULL; + int new_type = cJSON_Invalid; + + if ((object == NULL) || (string == NULL) || (item == NULL) || (object == item)) + { + return false; + } + + if (constant_key) + { + new_key = (char*)cast_away_const(string); + new_type = item->type | cJSON_StringIsConst; + } + else + { + new_key = (char*)cJSON_strdup((const unsigned char*)string, hooks); + if (new_key == NULL) + { + return false; + } + + new_type = item->type & ~cJSON_StringIsConst; + } + + if (!(item->type & cJSON_StringIsConst) && (item->string != NULL)) + { + hooks->deallocate(item->string); + } + + item->string = new_key; + item->type = new_type; + + return add_item_to_array(object, item); +} + +CJSON_PUBLIC(cJSON_bool) cJSON_AddItemToObject(cJSON *object, const char *string, cJSON *item) +{ + return add_item_to_object(object, string, item, &global_hooks, false); +} + +/* Add an item to an object with constant string as key */ +CJSON_PUBLIC(cJSON_bool) cJSON_AddItemToObjectCS(cJSON *object, const char *string, cJSON *item) +{ + return add_item_to_object(object, string, item, &global_hooks, true); +} + +CJSON_PUBLIC(cJSON_bool) cJSON_AddItemReferenceToArray(cJSON *array, cJSON *item) +{ + if (array == NULL) + { + return false; + } + + return add_item_to_array(array, create_reference(item, &global_hooks)); +} + +CJSON_PUBLIC(cJSON_bool) cJSON_AddItemReferenceToObject(cJSON *object, const char *string, cJSON *item) +{ + if ((object == NULL) || (string == NULL)) + { + return false; + } + + return add_item_to_object(object, string, create_reference(item, &global_hooks), &global_hooks, false); +} + +CJSON_PUBLIC(cJSON*) cJSON_AddNullToObject(cJSON * const object, const char * const name) +{ + cJSON *null = cJSON_CreateNull(); + if (add_item_to_object(object, name, null, &global_hooks, false)) + { + return null; + } + + cJSON_Delete(null); + return NULL; +} + +CJSON_PUBLIC(cJSON*) cJSON_AddTrueToObject(cJSON * const object, const char * const name) +{ + cJSON *true_item = cJSON_CreateTrue(); + if (add_item_to_object(object, name, true_item, &global_hooks, false)) + { + return true_item; + } + + cJSON_Delete(true_item); + return NULL; +} + +CJSON_PUBLIC(cJSON*) cJSON_AddFalseToObject(cJSON * const object, const char * const name) +{ + cJSON *false_item = cJSON_CreateFalse(); + if (add_item_to_object(object, name, false_item, &global_hooks, false)) + { + return false_item; + } + + cJSON_Delete(false_item); + return NULL; +} + +CJSON_PUBLIC(cJSON*) cJSON_AddBoolToObject(cJSON * const object, const char * const name, const cJSON_bool boolean) +{ + cJSON *bool_item = cJSON_CreateBool(boolean); + if (add_item_to_object(object, name, bool_item, &global_hooks, false)) + { + return bool_item; + } + + cJSON_Delete(bool_item); + return NULL; +} + +#ifdef __CJSON_USE_INT64 +CJSON_PUBLIC(cJSON*) cJSON_AddInt64NumberToObject(cJSON * const object, const char * const name, const long long integer) +{ + cJSON *int_item = cJSON_CreateInt64Number(integer); + if (add_item_to_object(object, name, int_item, &global_hooks, false)) + { + return int_item; + } + + cJSON_Delete(int_item); + return NULL; +} +#endif /* __CJSON_USE_INT64 */ + +CJSON_PUBLIC(cJSON*) cJSON_AddNumberToObject(cJSON * const object, const char * const name, const double number) +{ + cJSON *number_item = cJSON_CreateNumber(number); + if (add_item_to_object(object, name, number_item, &global_hooks, false)) + { + return number_item; + } + + cJSON_Delete(number_item); + return NULL; +} + +CJSON_PUBLIC(cJSON*) cJSON_AddStringToObject(cJSON * const object, const char * const name, const char * const string) +{ + cJSON *string_item = cJSON_CreateString(string); + if (add_item_to_object(object, name, string_item, &global_hooks, false)) + { + return string_item; + } + + cJSON_Delete(string_item); + return NULL; +} + +CJSON_PUBLIC(cJSON*) cJSON_AddRawToObject(cJSON * const object, const char * const name, const char * const raw) +{ + cJSON *raw_item = cJSON_CreateRaw(raw); + if (add_item_to_object(object, name, raw_item, &global_hooks, false)) + { + return raw_item; + } + + cJSON_Delete(raw_item); + return NULL; +} + +CJSON_PUBLIC(cJSON*) cJSON_AddObjectToObject(cJSON * const object, const char * const name) +{ + cJSON *object_item = cJSON_CreateObject(); + if (add_item_to_object(object, name, object_item, &global_hooks, false)) + { + return object_item; + } + + cJSON_Delete(object_item); + return NULL; +} + +CJSON_PUBLIC(cJSON*) cJSON_AddArrayToObject(cJSON * const object, const char * const name) +{ + cJSON *array = cJSON_CreateArray(); + if (add_item_to_object(object, name, array, &global_hooks, false)) + { + return array; + } + + cJSON_Delete(array); + return NULL; +} + +CJSON_PUBLIC(cJSON *) cJSON_DetachItemViaPointer(cJSON *parent, cJSON * const item) +{ + if ((parent == NULL) || (item == NULL) || (item != parent->child && item->prev == NULL)) + { + return NULL; + } + + if (item != parent->child) + { + /* not the first element */ + item->prev->next = item->next; + } + if (item->next != NULL) + { + /* not the last element */ + item->next->prev = item->prev; + } + + if (item == parent->child) + { + /* first element */ + parent->child = item->next; + } + else if (item->next == NULL) + { + /* last element */ + parent->child->prev = item->prev; + } + + /* make sure the detached item doesn't point anywhere anymore */ + item->prev = NULL; + item->next = NULL; + + return item; +} + +CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromArray(cJSON *array, int which) +{ + if (which < 0) + { + return NULL; + } + + return cJSON_DetachItemViaPointer(array, get_array_item(array, (size_t)which)); +} + +CJSON_PUBLIC(void) cJSON_DeleteItemFromArray(cJSON *array, int which) +{ + cJSON_Delete(cJSON_DetachItemFromArray(array, which)); +} + +CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromObject(cJSON *object, const char *string) +{ + cJSON *to_detach = cJSON_GetObjectItem(object, string); + + return cJSON_DetachItemViaPointer(object, to_detach); +} + +CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromObjectCaseSensitive(cJSON *object, const char *string) +{ + cJSON *to_detach = cJSON_GetObjectItemCaseSensitive(object, string); + + return cJSON_DetachItemViaPointer(object, to_detach); +} + +CJSON_PUBLIC(void) cJSON_DeleteItemFromObject(cJSON *object, const char *string) +{ + cJSON_Delete(cJSON_DetachItemFromObject(object, string)); +} + +CJSON_PUBLIC(void) cJSON_DeleteItemFromObjectCaseSensitive(cJSON *object, const char *string) +{ + cJSON_Delete(cJSON_DetachItemFromObjectCaseSensitive(object, string)); +} + +/* Replace array/object items with new ones. */ +CJSON_PUBLIC(cJSON_bool) cJSON_InsertItemInArray(cJSON *array, int which, cJSON *newitem) +{ + cJSON *after_inserted = NULL; + + if (which < 0 || newitem == NULL) + { + return false; + } + + after_inserted = get_array_item(array, (size_t)which); + if (after_inserted == NULL) + { + return add_item_to_array(array, newitem); + } + + if (after_inserted != array->child && after_inserted->prev == NULL) { + /* return false if after_inserted is a corrupted array item */ + return false; + } + + newitem->next = after_inserted; + newitem->prev = after_inserted->prev; + after_inserted->prev = newitem; + if (after_inserted == array->child) + { + array->child = newitem; + } + else + { + newitem->prev->next = newitem; + } + return true; +} + +CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemViaPointer(cJSON * const parent, cJSON * const item, cJSON * replacement) +{ + if ((parent == NULL) || (parent->child == NULL) || (replacement == NULL) || (item == NULL)) + { + return false; + } + + if (replacement == item) + { + return true; + } + + replacement->next = item->next; + replacement->prev = item->prev; + + if (replacement->next != NULL) + { + replacement->next->prev = replacement; + } + if (parent->child == item) + { + if (parent->child->prev == parent->child) + { + replacement->prev = replacement; + } + parent->child = replacement; + } + else + { /* + * To find the last item in array quickly, we use prev in array. + * We can't modify the last item's next pointer where this item was the parent's child + */ + if (replacement->prev != NULL) + { + replacement->prev->next = replacement; + } + if (replacement->next == NULL) + { + parent->child->prev = replacement; + } + } + + item->next = NULL; + item->prev = NULL; + cJSON_Delete(item); + + return true; +} + +CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemInArray(cJSON *array, int which, cJSON *newitem) +{ + if (which < 0) + { + return false; + } + + return cJSON_ReplaceItemViaPointer(array, get_array_item(array, (size_t)which), newitem); +} + +static cJSON_bool replace_item_in_object(cJSON *object, const char *string, cJSON *replacement, cJSON_bool case_sensitive) +{ + if ((replacement == NULL) || (string == NULL)) + { + return false; + } + + /* replace the name in the replacement */ + if (!(replacement->type & cJSON_StringIsConst) && (replacement->string != NULL)) + { + cJSON_free(replacement->string); + } + replacement->string = (char*)cJSON_strdup((const unsigned char*)string, &global_hooks); + if (replacement->string == NULL) + { + return false; + } + + replacement->type &= ~cJSON_StringIsConst; + + return cJSON_ReplaceItemViaPointer(object, get_object_item(object, string, case_sensitive), replacement); +} + +CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemInObject(cJSON *object, const char *string, cJSON *newitem) +{ + return replace_item_in_object(object, string, newitem, false); +} + +CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemInObjectCaseSensitive(cJSON *object, const char *string, cJSON *newitem) +{ + return replace_item_in_object(object, string, newitem, true); +} + +/* Create basic types: */ +CJSON_PUBLIC(cJSON *) cJSON_CreateNull(void) +{ + cJSON *item = cJSON_New_Item(&global_hooks); + if(item) + { + item->type = cJSON_NULL; + } + + return item; +} + +CJSON_PUBLIC(cJSON *) cJSON_CreateTrue(void) +{ + cJSON *item = cJSON_New_Item(&global_hooks); + if(item) + { + item->type = cJSON_True; + } + + return item; +} + +CJSON_PUBLIC(cJSON *) cJSON_CreateFalse(void) +{ + cJSON *item = cJSON_New_Item(&global_hooks); + if(item) + { + item->type = cJSON_False; + } + + return item; +} + +CJSON_PUBLIC(cJSON *) cJSON_CreateBool(cJSON_bool boolean) +{ + cJSON *item = cJSON_New_Item(&global_hooks); + if(item) + { + item->type = boolean ? cJSON_True : cJSON_False; + } + + return item; +} + +#ifdef __CJSON_USE_INT64 +CJSON_PUBLIC(cJSON *) cJSON_CreateInt64Number(long long integer) +{ + cJSON *item = cJSON_New_Item(&global_hooks); + if(item) + { + item->type = cJSON_Number | cJSON_IsInt64; + item->valueint = integer; + item->valuedouble = (double)integer; + } + + return item; +} +#endif /* __CJSON_USE_INT64 */ + +#ifdef __CJSON_USE_INT64 +CJSON_PUBLIC(cJSON *) cJSON_CreateNumber(double num) +{ + cJSON *item = cJSON_New_Item(&global_hooks); + if(item) + { + item->type = cJSON_Number; + item->valuedouble = num; + + /* use saturation in case of overflow */ + /* note that double max(DBL_MAX) is bigger than long long max(LLONG_MAX) */ + if (num >= (double)LLONG_MAX) + { + item->valueint = LLONG_MAX; + } + else if (num <= (double)LLONG_MIN) + { + item->valueint = LLONG_MIN; + } + else + { + item->valueint = (long long)num; + } + } + + return item; +} +#else +CJSON_PUBLIC(cJSON *) cJSON_CreateNumber(double num) +{ + cJSON *item = cJSON_New_Item(&global_hooks); + if(item) + { + item->type = cJSON_Number; + item->valuedouble = num; + + /* use saturation in case of overflow */ + if (num >= INT_MAX) + { + item->valueint = INT_MAX; + } + else if (num <= (double)INT_MIN) + { + item->valueint = INT_MIN; + } + else + { + item->valueint = (int)num; + } + } + + return item; +} +#endif /* __CJSON_USE_INT64 */ + +CJSON_PUBLIC(cJSON *) cJSON_CreateString(const char *string) +{ + cJSON *item = cJSON_New_Item(&global_hooks); + if(item) + { + item->type = cJSON_String; + item->valuestring = (char*)cJSON_strdup((const unsigned char*)string, &global_hooks); + if(!item->valuestring) + { + cJSON_Delete(item); + return NULL; + } + } + + return item; +} + +CJSON_PUBLIC(cJSON *) cJSON_CreateStringReference(const char *string) +{ + cJSON *item = cJSON_New_Item(&global_hooks); + if (item != NULL) + { + item->type = cJSON_String | cJSON_IsReference; + item->valuestring = (char*)cast_away_const(string); + } + + return item; +} + +CJSON_PUBLIC(cJSON *) cJSON_CreateObjectReference(const cJSON *child) +{ + cJSON *item = cJSON_New_Item(&global_hooks); + if (item != NULL) { + item->type = cJSON_Object | cJSON_IsReference; + item->child = (cJSON*)cast_away_const(child); + } + + return item; +} + +CJSON_PUBLIC(cJSON *) cJSON_CreateArrayReference(const cJSON *child) { + cJSON *item = cJSON_New_Item(&global_hooks); + if (item != NULL) { + item->type = cJSON_Array | cJSON_IsReference; + item->child = (cJSON*)cast_away_const(child); + } + + return item; +} + +CJSON_PUBLIC(cJSON *) cJSON_CreateRaw(const char *raw) +{ + cJSON *item = cJSON_New_Item(&global_hooks); + if(item) + { + item->type = cJSON_Raw; + item->valuestring = (char*)cJSON_strdup((const unsigned char*)raw, &global_hooks); + if(!item->valuestring) + { + cJSON_Delete(item); + return NULL; + } + } + + return item; +} + +CJSON_PUBLIC(cJSON *) cJSON_CreateArray(void) +{ + cJSON *item = cJSON_New_Item(&global_hooks); + if(item) + { + item->type=cJSON_Array; + } + + return item; +} + +CJSON_PUBLIC(cJSON *) cJSON_CreateObject(void) +{ + cJSON *item = cJSON_New_Item(&global_hooks); + if (item) + { + item->type = cJSON_Object; + } + + return item; +} + +/* Create Arrays: */ +CJSON_PUBLIC(cJSON *) cJSON_CreateIntArray(const int *numbers, int count) +{ + size_t i = 0; + cJSON *n = NULL; + cJSON *p = NULL; + cJSON *a = NULL; + + if ((count < 0) || (numbers == NULL)) + { + return NULL; + } + + a = cJSON_CreateArray(); + + for(i = 0; a && (i < (size_t)count); i++) + { + n = cJSON_CreateNumber(numbers[i]); + if (!n) + { + cJSON_Delete(a); + return NULL; + } + if(!i) + { + a->child = n; + } + else + { + suffix_object(p, n); + } + p = n; + } + + if (a && a->child) { + a->child->prev = n; + } + + return a; +} + +CJSON_PUBLIC(cJSON *) cJSON_CreateFloatArray(const float *numbers, int count) +{ + size_t i = 0; + cJSON *n = NULL; + cJSON *p = NULL; + cJSON *a = NULL; + + if ((count < 0) || (numbers == NULL)) + { + return NULL; + } + + a = cJSON_CreateArray(); + + for(i = 0; a && (i < (size_t)count); i++) + { + n = cJSON_CreateNumber((double)numbers[i]); + if(!n) + { + cJSON_Delete(a); + return NULL; + } + if(!i) + { + a->child = n; + } + else + { + suffix_object(p, n); + } + p = n; + } + + if (a && a->child) { + a->child->prev = n; + } + + return a; +} + +CJSON_PUBLIC(cJSON *) cJSON_CreateDoubleArray(const double *numbers, int count) +{ + size_t i = 0; + cJSON *n = NULL; + cJSON *p = NULL; + cJSON *a = NULL; + + if ((count < 0) || (numbers == NULL)) + { + return NULL; + } + + a = cJSON_CreateArray(); + + for(i = 0; a && (i < (size_t)count); i++) + { + n = cJSON_CreateNumber(numbers[i]); + if(!n) + { + cJSON_Delete(a); + return NULL; + } + if(!i) + { + a->child = n; + } + else + { + suffix_object(p, n); + } + p = n; + } + + if (a && a->child) { + a->child->prev = n; + } + + return a; +} + +CJSON_PUBLIC(cJSON *) cJSON_CreateStringArray(const char *const *strings, int count) +{ + size_t i = 0; + cJSON *n = NULL; + cJSON *p = NULL; + cJSON *a = NULL; + + if ((count < 0) || (strings == NULL)) + { + return NULL; + } + + a = cJSON_CreateArray(); + + for (i = 0; a && (i < (size_t)count); i++) + { + n = cJSON_CreateString(strings[i]); + if(!n) + { + cJSON_Delete(a); + return NULL; + } + if(!i) + { + a->child = n; + } + else + { + suffix_object(p,n); + } + p = n; + } + + if (a && a->child) { + a->child->prev = n; + } + + return a; +} + +/* Duplication */ +CJSON_PUBLIC(cJSON *) cJSON_Duplicate(const cJSON *item, cJSON_bool recurse) +{ + cJSON *newitem = NULL; + cJSON *child = NULL; + cJSON *next = NULL; + cJSON *newchild = NULL; + + /* Bail on bad ptr */ + if (!item) + { + goto fail; + } + /* Create new item */ + newitem = cJSON_New_Item(&global_hooks); + if (!newitem) + { + goto fail; + } + /* Copy over all vars */ + newitem->type = item->type & (~cJSON_IsReference); + newitem->valueint = item->valueint; + newitem->valuedouble = item->valuedouble; + if (item->valuestring) + { + newitem->valuestring = (char*)cJSON_strdup((unsigned char*)item->valuestring, &global_hooks); + if (!newitem->valuestring) + { + goto fail; + } + } + if (item->string) + { + newitem->string = (item->type&cJSON_StringIsConst) ? item->string : (char*)cJSON_strdup((unsigned char*)item->string, &global_hooks); + if (!newitem->string) + { + goto fail; + } + } + /* If non-recursive, then we're done! */ + if (!recurse) + { + return newitem; + } + /* Walk the ->next chain for the child. */ + child = item->child; + while (child != NULL) + { + newchild = cJSON_Duplicate(child, true); /* Duplicate (with recurse) each item in the ->next chain */ + if (!newchild) + { + goto fail; + } + if (next != NULL) + { + /* If newitem->child already set, then crosswire ->prev and ->next and move on */ + next->next = newchild; + newchild->prev = next; + next = newchild; + } + else + { + /* Set newitem->child and move to it */ + newitem->child = newchild; + next = newchild; + } + child = child->next; + } + if (newitem && newitem->child) + { + newitem->child->prev = newchild; + } + + return newitem; + +fail: + if (newitem != NULL) + { + cJSON_Delete(newitem); + } + + return NULL; +} + +static void skip_oneline_comment(char **input) +{ + *input += static_strlen("//"); + + for (; (*input)[0] != '\0'; ++(*input)) + { + if ((*input)[0] == '\n') { + *input += static_strlen("\n"); + return; + } + } +} + +static void skip_multiline_comment(char **input) +{ + *input += static_strlen("/*"); + + for (; (*input)[0] != '\0'; ++(*input)) + { + if (((*input)[0] == '*') && ((*input)[1] == '/')) + { + *input += static_strlen("*/"); + return; + } + } +} + +static void minify_string(char **input, char **output) { + (*output)[0] = (*input)[0]; + *input += static_strlen("\""); + *output += static_strlen("\""); + + + for (; (*input)[0] != '\0'; (void)++(*input), ++(*output)) { + (*output)[0] = (*input)[0]; + + if ((*input)[0] == '\"') { + (*output)[0] = '\"'; + *input += static_strlen("\""); + *output += static_strlen("\""); + return; + } else if (((*input)[0] == '\\') && ((*input)[1] == '\"')) { + (*output)[1] = (*input)[1]; + *input += static_strlen("\""); + *output += static_strlen("\""); + } + } +} + +CJSON_PUBLIC(void) cJSON_Minify(char *json) +{ + char *into = json; + + if (json == NULL) + { + return; + } + + while (json[0] != '\0') + { + switch (json[0]) + { + case ' ': + case '\t': + case '\r': + case '\n': + json++; + break; + + case '/': + if (json[1] == '/') + { + skip_oneline_comment(&json); + } + else if (json[1] == '*') + { + skip_multiline_comment(&json); + } else { + json++; + } + break; + + case '\"': + minify_string(&json, (char**)&into); + break; + + default: + into[0] = json[0]; + json++; + into++; + } + } + + /* and null-terminate. */ + *into = '\0'; +} + +CJSON_PUBLIC(cJSON_bool) cJSON_IsInvalid(const cJSON * const item) +{ + if (item == NULL) + { + return false; + } + + return (item->type & 0xFF) == cJSON_Invalid; +} + +CJSON_PUBLIC(cJSON_bool) cJSON_IsFalse(const cJSON * const item) +{ + if (item == NULL) + { + return false; + } + + return (item->type & 0xFF) == cJSON_False; +} + +CJSON_PUBLIC(cJSON_bool) cJSON_IsTrue(const cJSON * const item) +{ + if (item == NULL) + { + return false; + } + + return (item->type & 0xff) == cJSON_True; +} + + +CJSON_PUBLIC(cJSON_bool) cJSON_IsBool(const cJSON * const item) +{ + if (item == NULL) + { + return false; + } + + return (item->type & (cJSON_True | cJSON_False)) != 0; +} +CJSON_PUBLIC(cJSON_bool) cJSON_IsNull(const cJSON * const item) +{ + if (item == NULL) + { + return false; + } + + return (item->type & 0xFF) == cJSON_NULL; +} + +#ifdef __CJSON_USE_INT64 +CJSON_PUBLIC(cJSON_bool) cJSON_IsInt64Number(const cJSON * const item) +{ + if (item == NULL) + { + return false; + } + + return cJSON_IsNumber(item) && (item->type & cJSON_IsInt64); +} +#endif /* __CJSON_USE_INT64 */ + +CJSON_PUBLIC(cJSON_bool) cJSON_IsNumber(const cJSON * const item) +{ + if (item == NULL) + { + return false; + } + + return (item->type & 0xFF) == cJSON_Number; +} + +CJSON_PUBLIC(cJSON_bool) cJSON_IsString(const cJSON * const item) +{ + if (item == NULL) + { + return false; + } + + return (item->type & 0xFF) == cJSON_String; +} + +CJSON_PUBLIC(cJSON_bool) cJSON_IsArray(const cJSON * const item) +{ + if (item == NULL) + { + return false; + } + + return (item->type & 0xFF) == cJSON_Array; +} + +CJSON_PUBLIC(cJSON_bool) cJSON_IsObject(const cJSON * const item) +{ + if (item == NULL) + { + return false; + } + + return (item->type & 0xFF) == cJSON_Object; +} + +CJSON_PUBLIC(cJSON_bool) cJSON_IsRaw(const cJSON * const item) +{ + if (item == NULL) + { + return false; + } + + return (item->type & 0xFF) == cJSON_Raw; +} + +CJSON_PUBLIC(cJSON_bool) cJSON_Compare(const cJSON * const a, const cJSON * const b, const cJSON_bool case_sensitive) +{ + if ((a == NULL) || (b == NULL) || ((a->type & 0xFF) != (b->type & 0xFF))) + { + return false; + } + + /* check if type is valid */ + switch (a->type & 0xFF) + { + case cJSON_False: + case cJSON_True: + case cJSON_NULL: + case cJSON_Number: + case cJSON_String: + case cJSON_Raw: + case cJSON_Array: + case cJSON_Object: + break; + + default: + return false; + } + + /* identical objects are equal */ + if (a == b) + { + return true; + } + + switch (a->type & 0xFF) + { + /* in these cases and equal type is enough */ + case cJSON_False: + case cJSON_True: + case cJSON_NULL: + return true; + +#ifdef __CJSON_USE_INT64 + case cJSON_Number: + if (!compare_double(a->valuedouble, b->valuedouble)) + { + return false; + } + + if ((a->type & cJSON_IsInt64) != (b->type & cJSON_IsInt64)) + { + /* cJSON_IsInt64 should also be considered */ + return false; + } + + if ((a->type & cJSON_IsInt64) && (b->type & cJSON_IsInt64)) + { + /* compare valueint if both of them are int64 */ + return a->valueint == b->valueint; + } + + return true; +#else + case cJSON_Number: + if (compare_double(a->valuedouble, b->valuedouble)) + { + return true; + } + return false; +#endif /* __CJSON_USE_INT64 */ + + case cJSON_String: + case cJSON_Raw: + if ((a->valuestring == NULL) || (b->valuestring == NULL)) + { + return false; + } + if (strcmp(a->valuestring, b->valuestring) == 0) + { + return true; + } + + return false; + + case cJSON_Array: + { + cJSON *a_element = a->child; + cJSON *b_element = b->child; + + for (; (a_element != NULL) && (b_element != NULL);) + { + if (!cJSON_Compare(a_element, b_element, case_sensitive)) + { + return false; + } + + a_element = a_element->next; + b_element = b_element->next; + } + + /* one of the arrays is longer than the other */ + if (a_element != b_element) { + return false; + } + + return true; + } + + case cJSON_Object: + { + cJSON *a_element = NULL; + cJSON *b_element = NULL; + cJSON_ArrayForEach(a_element, a) + { + /* TODO This has O(n^2) runtime, which is horrible! */ + b_element = get_object_item(b, a_element->string, case_sensitive); + if (b_element == NULL) + { + return false; + } + + if (!cJSON_Compare(a_element, b_element, case_sensitive)) + { + return false; + } + } + + /* doing this twice, once on a and b to prevent true comparison if a subset of b + * TODO: Do this the proper way, this is just a fix for now */ + cJSON_ArrayForEach(b_element, b) + { + a_element = get_object_item(a, b_element->string, case_sensitive); + if (a_element == NULL) + { + return false; + } + + if (!cJSON_Compare(b_element, a_element, case_sensitive)) + { + return false; + } + } + + return true; + } + + default: + return false; + } +} + +CJSON_PUBLIC(void *) cJSON_malloc(size_t size) +{ + return global_hooks.allocate(size); +} + +CJSON_PUBLIC(void) cJSON_free(void *object) +{ + global_hooks.deallocate(object); +} +} // namespace DmJson +} // namespace DistributedHardware +} // namespace OHOS \ No newline at end of file diff --git a/common/src/json_object.cpp b/json/src/json_object.cpp similarity index 100% rename from common/src/json_object.cpp rename to json/src/json_object.cpp diff --git a/radar/BUILD.gn b/radar/BUILD.gn index ff44ebe01..febc21165 100644 --- a/radar/BUILD.gn +++ b/radar/BUILD.gn @@ -25,7 +25,7 @@ if (defined(ohos_lite)) { "${common_path}/include", "${innerkits_path}/native_cpp/include", "${c_utils_path}/include", - "//third_party/cJSON", + "${json_path}/include", ] sources = [ "src/lite/dm_radar_helper.cpp" ] @@ -38,6 +38,7 @@ if (defined(ohos_lite)) { deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", + "${json_path}:devicemanagerjson", "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", "//base/startup/init/interfaces/innerkits:libbegetutil", "//commonlibrary/utils_lite:utils", @@ -65,6 +66,7 @@ if (defined(ohos_lite)) { "include", "${common_path}/include", "${innerkits_path}/native_cpp/include", + "${json_path}/include", ] sanitize = { @@ -92,14 +94,17 @@ if (defined(ohos_lite)) { "HI_LOG_ENABLE", "DH_LOG_TAG=\"devicemanagerradar\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] - deps = [ "${innerkits_path}/native_cpp:devicemanagersdk" ] + deps = [ + "${innerkits_path}/native_cpp:devicemanagersdk", + "${json_path}:devicemanagerjson", + ] external_deps = [ "access_token:libaccesstoken_sdk", "access_token:libtokenid_sdk", - "cJSON:cjson", "c_utils:utils", "hilog:libhilog", "hisysevent:libhisysevent", @@ -118,6 +123,7 @@ if (defined(ohos_lite)) { "include", "${common_path}/include", "${innerkits_path}/native_cpp/include", + "${json_path}/include", ] sanitize = { @@ -143,14 +149,17 @@ if (defined(ohos_lite)) { "HI_LOG_ENABLE", "DH_LOG_TAG=\"devicemanagerradar\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] - deps = [ "${innerkits_path}/native_cpp:devicemanagersdk" ] + deps = [ + "${innerkits_path}/native_cpp:devicemanagersdk", + "${json_path}:devicemanagerjson", + ] external_deps = [ "access_token:libaccesstoken_sdk", "access_token:libtokenid_sdk", - "cJSON:cjson", "c_utils:utils", "hilog:libhilog", "hisysevent:libhisysevent", diff --git a/radar/src/dm_radar_helper.cpp b/radar/src/dm_radar_helper.cpp index c62a930cb..839025452 100644 --- a/radar/src/dm_radar_helper.cpp +++ b/radar/src/dm_radar_helper.cpp @@ -19,7 +19,7 @@ #include #include #include -#include +#include "dm_cJSON.h" #include #include "hisysevent.h" #include "dm_constants.h" @@ -34,6 +34,7 @@ using namespace OHOS::Security::AccessToken; namespace OHOS { namespace DistributedHardware { +using namespace DmJson; const char* ORGPKGNAME = "deviceManager"; const char* SOFTBUSNAME = "dsoftbus"; const char* HICHAINNAME = "hichain"; diff --git a/radar/src/lite/dm_radar_helper.cpp b/radar/src/lite/dm_radar_helper.cpp index 29962be5d..28e1e4df9 100644 --- a/radar/src/lite/dm_radar_helper.cpp +++ b/radar/src/lite/dm_radar_helper.cpp @@ -17,7 +17,7 @@ #include #include #include -#include +#include "dm_cJSON.h" #include "dm_constants.h" #include "dm_log.h" #include "parameter.h" diff --git a/services/implementation/BUILD.gn b/services/implementation/BUILD.gn index 652b2e073..de3ddcad6 100644 --- a/services/implementation/BUILD.gn +++ b/services/implementation/BUILD.gn @@ -43,7 +43,7 @@ if (defined(ohos_lite)) { "${utils_path}/include/crypto", "${utils_path}/include/fwkload/lite", "${utils_path}/include/timer/lite", - "//third_party/json/include", + "${json_path}/include", "${services_path}/include", "${services_path}/include/ipc/lite", "${interfaces_path}/c/ipc/include", @@ -79,6 +79,7 @@ if (defined(ohos_lite)) { deps = [ "${devicemanager_path}/radar:devicemanagerradar", + "${json_path}:devicemanagerjson", "${softbuscache_parh}:dmdevicecache", "${utils_path}:devicemanagerutils", "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", @@ -141,6 +142,7 @@ if (defined(ohos_lite)) { "${utils_path}/include/fwkload/standard", "${utils_path}/include/permission/standard", "${utils_path}/include/timer", + "${json_path}/include", "${services_path}/include", "${services_path}/include/ipc/standard", "${softbuscache_parh}/include", @@ -201,12 +203,14 @@ if (defined(ohos_lite)) { "HI_LOG_ENABLE", "DH_LOG_TAG=\"devicemanagerserviceimpl\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] deps = [ "${devicemanager_path}/commondependency:devicemanagerdependency", "${devicemanager_path}/radar:devicemanagerradar", "${innerkits_path}/native_cpp:devicemanagersdk", + "${json_path}:devicemanagerjson", "${softbuscache_parh}:dmdevicecache", "${utils_path}:devicemanagerutils", ] @@ -217,7 +221,6 @@ if (defined(ohos_lite)) { "ability_runtime:ability_connect_callback_stub", "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", - "cJSON:cjson", "c_utils:utils", "common_event_service:cesfwk_core", "common_event_service:cesfwk_innerkits", @@ -246,8 +249,6 @@ if (defined(ohos_lite)) { defines += [ "DEVICE_MANAGER_COMMON_FLAG" ] } - public_external_deps = [ "cJSON:cjson" ] - subsystem_name = "distributedhardware" part_name = "device_manager" diff --git a/services/implementation/include/i18n/dm_language_manager.h b/services/implementation/include/i18n/dm_language_manager.h index 9cbc36243..74b0ca886 100644 --- a/services/implementation/include/i18n/dm_language_manager.h +++ b/services/implementation/include/i18n/dm_language_manager.h @@ -19,11 +19,11 @@ #include #include -#include "cJSON.h" +#include "dm_cJSON.h" #include "dm_single_instance.h" namespace OHOS { namespace DistributedHardware { - +using namespace DmJson; class DmLanguageManager { DM_DECLARE_SINGLE_INSTANCE_BASE(DmLanguageManager); diff --git a/services/implementation/src/dependency/hichain/hichain_auth_connector.cpp b/services/implementation/src/dependency/hichain/hichain_auth_connector.cpp index e18cbf08b..4ce5f2eb6 100644 --- a/services/implementation/src/dependency/hichain/hichain_auth_connector.cpp +++ b/services/implementation/src/dependency/hichain/hichain_auth_connector.cpp @@ -19,7 +19,7 @@ #include "dm_constants.h" #include "hichain_connector_callback.h" #include "parameter.h" -#include "cJSON.h" +#include "dm_cJSON.h" namespace OHOS { namespace DistributedHardware { diff --git a/services/implementation/src/i18n/dm_language_manager.cpp b/services/implementation/src/i18n/dm_language_manager.cpp index 77f080ee5..3357cd49b 100644 --- a/services/implementation/src/i18n/dm_language_manager.cpp +++ b/services/implementation/src/i18n/dm_language_manager.cpp @@ -15,7 +15,7 @@ #include "dm_language_manager.h" -#include "cJSON.h" +#include "dm_cJSON.h" #include #include "dm_constants.h" diff --git a/services/service/BUILD.gn b/services/service/BUILD.gn index 7fe1423a0..d76727825 100644 --- a/services/service/BUILD.gn +++ b/services/service/BUILD.gn @@ -44,10 +44,10 @@ if (defined(ohos_lite)) { "${utils_path}/include/fwkload/lite", "${utils_path}/include/kvadapter", "${utils_path}/include/timer/lite", + "${json_path}/include", "${innerkits_path}/native_cpp/include", "${innerkits_path}/native_cpp/include/ipc", "${innerkits_path}/native_cpp/include/ipc/lite", - "//third_party/json/include", "//third_party/bounds_checking_function/include", "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog", "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog_lite", @@ -92,6 +92,7 @@ if (defined(ohos_lite)) { deps = [ "${devicemanager_path}/radar:devicemanagerradar", "${innerkits_path}/native_cpp:devicemanagersdk", + "${json_path}:devicemanagerjson", "${softbuscache_parh}:dmdevicecache", "${utils_path}:devicemanagerutils", "//base/security/device_auth/services:deviceauth_sdk", @@ -154,6 +155,7 @@ if (defined(ohos_lite)) { "${utils_path}/include/crypto", "${utils_path}/include/kvadapter", "${utils_path}/include/timer", + "${json_path}/include", ] } config("cflags_config") { @@ -235,12 +237,14 @@ if (defined(ohos_lite)) { "HI_LOG_ENABLE", "DH_LOG_TAG=\"devicemanagerservice\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] deps = [ "${devicemanager_path}/commondependency:devicemanagerdependency", "${devicemanager_path}/radar:devicemanagerradar", "${innerkits_path}/native_cpp:devicemanagersdk", + "${json_path}:devicemanagerjson", "${softbuscache_parh}:dmdevicecache", "${utils_path}:devicemanagerutils", ] @@ -250,7 +254,6 @@ if (defined(ohos_lite)) { "access_token:libaccesstoken_sdk", "access_token:libtokenid_sdk", "bundle_framework:appexecfwk_base", - "cJSON:cjson", "c_utils:utils", "common_event_service:cesfwk_core", "common_event_service:cesfwk_innerkits", @@ -307,8 +310,6 @@ if (defined(ohos_lite)) { defines += [ "DEVICE_MANAGER_COMMON_FLAG" ] } - public_external_deps = [ "cJSON:cjson" ] - subsystem_name = "distributedhardware" part_name = "device_manager" @@ -378,12 +379,14 @@ if (defined(ohos_lite)) { "HI_LOG_ENABLE", "DH_LOG_TAG=\"devicemanagerservice\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] deps = [ "${devicemanager_path}/commondependency:devicemanagerdependency", "${devicemanager_path}/radar:devicemanagerradar", "${innerkits_path}/native_cpp:devicemanagersdk", + "${json_path}:devicemanagerjson", "${softbuscache_parh}:dmdevicecache", "${utils_path}:devicemanagerutils", ] @@ -392,7 +395,6 @@ if (defined(ohos_lite)) { "ability_base:want", "access_token:libaccesstoken_sdk", "access_token:libtokenid_sdk", - "cJSON:cjson", "c_utils:utils", "common_event_service:cesfwk_core", "common_event_service:cesfwk_innerkits", @@ -449,8 +451,6 @@ if (defined(ohos_lite)) { defines += [ "DEVICE_MANAGER_COMMON_FLAG" ] } - public_external_deps = [ "cJSON:cjson" ] - subsystem_name = "distributedhardware" part_name = "device_manager" diff --git a/services/service/include/relationshipsyncmgr/dm_transport_msg.h b/services/service/include/relationshipsyncmgr/dm_transport_msg.h index a4fb17712..08374a20e 100644 --- a/services/service/include/relationshipsyncmgr/dm_transport_msg.h +++ b/services/service/include/relationshipsyncmgr/dm_transport_msg.h @@ -17,10 +17,11 @@ #define OHOS_DM_TRANSPORT_MSG_H #include -#include +#include "dm_cJSON.h" namespace OHOS { namespace DistributedHardware { +using namespace DmJson; struct UserIdsMsg { std::vector foregroundUserIds; std::vector backgroundUserIds; diff --git a/services/service/include/relationshipsyncmgr/relationship_sync_mgr.h b/services/service/include/relationshipsyncmgr/relationship_sync_mgr.h index d0787d446..227a5caf5 100644 --- a/services/service/include/relationshipsyncmgr/relationship_sync_mgr.h +++ b/services/service/include/relationshipsyncmgr/relationship_sync_mgr.h @@ -17,10 +17,11 @@ #define OHOS_RELATIONSHIP_SYNC_MGR_H #include -#include "cJSON.h" +#include "dm_cJSON.h" #include "dm_single_instance.h" namespace OHOS { namespace DistributedHardware { +using namespace DmJson; enum class RelationShipChangeType : uint32_t { ACCOUNT_LOGOUT = 0, DEVICE_UNBIND = 1, diff --git a/services/service/include/softbus/softbus_listener.h b/services/service/include/softbus/softbus_listener.h index 55850a37a..9e0941b66 100644 --- a/services/service/include/softbus/softbus_listener.h +++ b/services/service/include/softbus/softbus_listener.h @@ -25,7 +25,7 @@ #include #include -#include "cJSON.h" +#include "dm_cJSON.h" #include "softbus_bus_center.h" #include "dm_publish_info.h" #include "dm_radar_helper.h" @@ -37,6 +37,7 @@ namespace OHOS { namespace DistributedHardware { +using namespace DmJson; class SoftbusListener { public: SoftbusListener(); diff --git a/services/service/src/device_manager_service.cpp b/services/service/src/device_manager_service.cpp index d920d6b36..1041abee6 100644 --- a/services/service/src/device_manager_service.cpp +++ b/services/service/src/device_manager_service.cpp @@ -15,7 +15,7 @@ #include "device_manager_service.h" -#include "cJSON.h" +#include "dm_cJSON.h" #include #include #include "app_manager.h" @@ -64,6 +64,8 @@ constexpr const char* LIB_DM_RESIDENT_NAME = "libdevicemanagerresident.z.so"; namespace OHOS { namespace DistributedHardware { +using namespace DmJson; + DM_IMPLEMENT_SINGLE_INSTANCE(DeviceManagerService); namespace { const int32_t NORMAL = 0; diff --git a/services/service/src/device_manager_service_listener.cpp b/services/service/src/device_manager_service_listener.cpp index ba30c6d62..907da5006 100644 --- a/services/service/src/device_manager_service_listener.cpp +++ b/services/service/src/device_manager_service_listener.cpp @@ -14,7 +14,7 @@ */ #include -#include "cJSON.h" +#include "dm_cJSON.h" #include "device_manager_service_listener.h" @@ -53,6 +53,7 @@ namespace OHOS { namespace DistributedHardware { +using namespace DmJson; std::mutex DeviceManagerServiceListener::alreadyNotifyPkgNameLock_; std::map DeviceManagerServiceListener::alreadyOnlinePkgName_ = {}; std::unordered_set DeviceManagerServiceListener::highPriorityPkgNameSet_ = { "ohos.deviceprofile", diff --git a/services/softbuscache/BUILD.gn b/services/softbuscache/BUILD.gn index b9dffcf3c..c26f11da1 100644 --- a/services/softbuscache/BUILD.gn +++ b/services/softbuscache/BUILD.gn @@ -25,7 +25,7 @@ if (defined(ohos_lite)) { "${common_path}/include", "${innerkits_path}/native_cpp/include", "${utils_path}/include/crypto", - "//third_party/cJSON", + "${json_path}/include", ] sources = [ @@ -42,6 +42,7 @@ if (defined(ohos_lite)) { deps = [ "${dsoftbussdk_path}:softbus_client", "${hilog_path}:hilog_shared", + "${json_path}:devicemanagerjson", "${third_path}:libsec_shared", "${utils_path}:devicemanagerutils", ] @@ -81,10 +82,12 @@ if (defined(ohos_lite)) { "HI_LOG_ENABLE", "DH_LOG_TAG=\"dmdevicecache\"", "LOG_DOMAIN=0xD004113", + "__CJSON_USE_INT64", ] deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", + "${json_path}:devicemanagerjson", "${utils_path}:devicemanagerutils", ] diff --git a/test/commonfuzztest/authenticatedevice_fuzzer/BUILD.gn b/test/commonfuzztest/authenticatedevice_fuzzer/BUILD.gn index 80b79330e..cd0a7ac92 100644 --- a/test/commonfuzztest/authenticatedevice_fuzzer/BUILD.gn +++ b/test/commonfuzztest/authenticatedevice_fuzzer/BUILD.gn @@ -65,6 +65,7 @@ ohos_fuzztest("AuthenticateDeviceFuzzTest") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"AuthenticateDeviceFuzzTest\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] external_deps = [ diff --git a/test/commonfuzztest/authenticatedeviceservice_fuzzer/BUILD.gn b/test/commonfuzztest/authenticatedeviceservice_fuzzer/BUILD.gn index 5c81e1a9f..4534e8cce 100644 --- a/test/commonfuzztest/authenticatedeviceservice_fuzzer/BUILD.gn +++ b/test/commonfuzztest/authenticatedeviceservice_fuzzer/BUILD.gn @@ -65,6 +65,7 @@ ohos_fuzztest("AuthenticateDeviceServiceFuzzTest") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"AuthenticateDeviceServiceFuzzTest\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] external_deps = [ @@ -72,7 +73,6 @@ ohos_fuzztest("AuthenticateDeviceServiceFuzzTest") { "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", - "cJSON:cjson", "device_auth:deviceauth_sdk", "device_info_manager:distributed_device_profile_common", "device_info_manager:distributed_device_profile_sdk", diff --git a/test/commonfuzztest/authenticatedeviceserviceimpl_fuzzer/BUILD.gn b/test/commonfuzztest/authenticatedeviceserviceimpl_fuzzer/BUILD.gn index 1b8ea38d2..de76f2d4a 100644 --- a/test/commonfuzztest/authenticatedeviceserviceimpl_fuzzer/BUILD.gn +++ b/test/commonfuzztest/authenticatedeviceserviceimpl_fuzzer/BUILD.gn @@ -66,6 +66,7 @@ ohos_fuzztest("AuthenticateDeviceServiceImplFuzzTest") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"AuthenticateDeviceServiceImplFuzzTest\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] external_deps = [ @@ -73,7 +74,6 @@ ohos_fuzztest("AuthenticateDeviceServiceImplFuzzTest") { "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", - "cJSON:cjson", "device_auth:deviceauth_sdk", "device_info_manager:distributed_device_profile_common", "device_info_manager:distributed_device_profile_sdk", diff --git a/test/commonfuzztest/dmauthmanager_fuzzer/BUILD.gn b/test/commonfuzztest/dmauthmanager_fuzzer/BUILD.gn index 34dc2e750..4c990cac6 100644 --- a/test/commonfuzztest/dmauthmanager_fuzzer/BUILD.gn +++ b/test/commonfuzztest/dmauthmanager_fuzzer/BUILD.gn @@ -66,6 +66,7 @@ ohos_fuzztest("DmAuthManagerFuzzTest") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"DmAuthManagerFuzzTest\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] } diff --git a/test/commonfuzztest/dmcommoneventmanager_fuzzer/BUILD.gn b/test/commonfuzztest/dmcommoneventmanager_fuzzer/BUILD.gn index 4c8224114..023e8911f 100644 --- a/test/commonfuzztest/dmcommoneventmanager_fuzzer/BUILD.gn +++ b/test/commonfuzztest/dmcommoneventmanager_fuzzer/BUILD.gn @@ -56,6 +56,7 @@ ohos_fuzztest("DmCommonEventManagerFuzzTest") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"DmCommonEventManagerFuzzTest\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] external_deps = [ diff --git a/test/commonfuzztest/dmcredentialimpl_fuzzer/BUILD.gn b/test/commonfuzztest/dmcredentialimpl_fuzzer/BUILD.gn index 05d532c4c..f406015df 100644 --- a/test/commonfuzztest/dmcredentialimpl_fuzzer/BUILD.gn +++ b/test/commonfuzztest/dmcredentialimpl_fuzzer/BUILD.gn @@ -58,6 +58,7 @@ ohos_fuzztest("DMCredentialImplFuzzTest") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"DMCredentialImplFuzzTest\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] external_deps = [ diff --git a/test/commonfuzztest/dmdiscoverymanager_fuzzer/BUILD.gn b/test/commonfuzztest/dmdiscoverymanager_fuzzer/BUILD.gn index c2e7053b7..e69c93626 100644 --- a/test/commonfuzztest/dmdiscoverymanager_fuzzer/BUILD.gn +++ b/test/commonfuzztest/dmdiscoverymanager_fuzzer/BUILD.gn @@ -53,6 +53,7 @@ ohos_fuzztest("DmDiscoveryManagerFuzzTest") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"DmDiscoveryManagerFuzzTest\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] external_deps = [ diff --git a/test/commonfuzztest/generateencrypteduuid_fuzzer/BUILD.gn b/test/commonfuzztest/generateencrypteduuid_fuzzer/BUILD.gn index b6d56f31e..72f7cdbfe 100644 --- a/test/commonfuzztest/generateencrypteduuid_fuzzer/BUILD.gn +++ b/test/commonfuzztest/generateencrypteduuid_fuzzer/BUILD.gn @@ -56,6 +56,7 @@ ohos_fuzztest("GenerateEncryptedUuidFuzzTest") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"GenerateEncryptedUuidFuzzTest\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] } diff --git a/test/commonfuzztest/getdeviceinfo_fuzzer/BUILD.gn b/test/commonfuzztest/getdeviceinfo_fuzzer/BUILD.gn index c8cbead48..e595e0d29 100644 --- a/test/commonfuzztest/getdeviceinfo_fuzzer/BUILD.gn +++ b/test/commonfuzztest/getdeviceinfo_fuzzer/BUILD.gn @@ -50,6 +50,7 @@ ohos_fuzztest("GetDeviceInfoFuzzTest") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"GetDeviceInfoFuzzTest\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] external_deps = [ diff --git a/test/commonfuzztest/hichainconnector_fuzzer/BUILD.gn b/test/commonfuzztest/hichainconnector_fuzzer/BUILD.gn index 4d23006b0..7e9a4120e 100644 --- a/test/commonfuzztest/hichainconnector_fuzzer/BUILD.gn +++ b/test/commonfuzztest/hichainconnector_fuzzer/BUILD.gn @@ -46,6 +46,7 @@ ohos_fuzztest("HichainConnectorFuzzTest") { deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", + "${json_path}:devicemanagerjson", "${services_path}:devicemanagerservicetest", "${servicesimpl_path}:devicemanagerserviceimpl", "${utils_path}:devicemanagerutilstest", @@ -66,6 +67,7 @@ ohos_fuzztest("HichainConnectorFuzzTest") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"HichainConnectorFuzzTest\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] } diff --git a/test/commonfuzztest/ondatareceived_fuzzer/BUILD.gn b/test/commonfuzztest/ondatareceived_fuzzer/BUILD.gn index b86115727..d7dfefd18 100644 --- a/test/commonfuzztest/ondatareceived_fuzzer/BUILD.gn +++ b/test/commonfuzztest/ondatareceived_fuzzer/BUILD.gn @@ -65,6 +65,7 @@ ohos_fuzztest("OnDataReceivedFuzzTest") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"OnDataReceivedFuzzTest\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] } diff --git a/test/commonfuzztest/onerror_fuzzer/BUILD.gn b/test/commonfuzztest/onerror_fuzzer/BUILD.gn index 2b3aa462a..dca3887cf 100644 --- a/test/commonfuzztest/onerror_fuzzer/BUILD.gn +++ b/test/commonfuzztest/onerror_fuzzer/BUILD.gn @@ -64,6 +64,7 @@ ohos_fuzztest("OnErrorFuzzTest") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"OnErrorFuzzTest\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] } diff --git a/test/commonfuzztest/onfinish_fuzzer/BUILD.gn b/test/commonfuzztest/onfinish_fuzzer/BUILD.gn index 6883f3964..3c4e2a88b 100644 --- a/test/commonfuzztest/onfinish_fuzzer/BUILD.gn +++ b/test/commonfuzztest/onfinish_fuzzer/BUILD.gn @@ -64,6 +64,7 @@ ohos_fuzztest("OnFinishFuzzTest") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"OnFinishFuzzTest\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] } diff --git a/test/commonfuzztest/onrequest_fuzzer/BUILD.gn b/test/commonfuzztest/onrequest_fuzzer/BUILD.gn index 34ea316f9..b268f554c 100644 --- a/test/commonfuzztest/onrequest_fuzzer/BUILD.gn +++ b/test/commonfuzztest/onrequest_fuzzer/BUILD.gn @@ -65,6 +65,7 @@ ohos_fuzztest("OnRequestFuzzTest") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"OnRequestFuzzTest\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] } diff --git a/test/commonfuzztest/pinauth_fuzzer/BUILD.gn b/test/commonfuzztest/pinauth_fuzzer/BUILD.gn index 5b8f16498..bcda36b2e 100644 --- a/test/commonfuzztest/pinauth_fuzzer/BUILD.gn +++ b/test/commonfuzztest/pinauth_fuzzer/BUILD.gn @@ -74,6 +74,7 @@ ohos_fuzztest("PinAuthFuzzTest") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"PinAuthFuzzTest\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] external_deps = [ diff --git a/test/commonfuzztest/pinauthui_fuzzer/BUILD.gn b/test/commonfuzztest/pinauthui_fuzzer/BUILD.gn index 909089f87..f43b907e0 100644 --- a/test/commonfuzztest/pinauthui_fuzzer/BUILD.gn +++ b/test/commonfuzztest/pinauthui_fuzzer/BUILD.gn @@ -75,6 +75,7 @@ ohos_fuzztest("PinAuthUiFuzzTest") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"PinAuthUiFuzzTest\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] external_deps = [ diff --git a/test/commonfuzztest/pinholder_fuzzer/BUILD.gn b/test/commonfuzztest/pinholder_fuzzer/BUILD.gn index 6fc3a858f..2c10bd0ce 100644 --- a/test/commonfuzztest/pinholder_fuzzer/BUILD.gn +++ b/test/commonfuzztest/pinholder_fuzzer/BUILD.gn @@ -75,6 +75,7 @@ ohos_fuzztest("PinHolderFuzzTest") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"PinHolderFuzzTest\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] external_deps = [ diff --git a/test/servicesfuzztest/cryptomgr_fuzzer/BUILD.gn b/test/servicesfuzztest/cryptomgr_fuzzer/BUILD.gn index 5d38cb5fc..e7cd293fb 100644 --- a/test/servicesfuzztest/cryptomgr_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/cryptomgr_fuzzer/BUILD.gn @@ -70,6 +70,7 @@ ohos_fuzztest("CryptoMgrFuzzTest") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"CryptoMgrFuzzTest\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] external_deps = [ diff --git a/test/servicesfuzztest/devicediscovery_fuzzer/BUILD.gn b/test/servicesfuzztest/devicediscovery_fuzzer/BUILD.gn index d25753b45..6b3033235 100644 --- a/test/servicesfuzztest/devicediscovery_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/devicediscovery_fuzzer/BUILD.gn @@ -65,6 +65,7 @@ ohos_fuzztest("DeviceDiscoveryFuzzTest") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"DeviceDiscoveryFuzzTest\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] external_deps = [ diff --git a/test/servicesfuzztest/devicelist_fuzzer/BUILD.gn b/test/servicesfuzztest/devicelist_fuzzer/BUILD.gn index dabde34eb..dd57c9fcf 100644 --- a/test/servicesfuzztest/devicelist_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/devicelist_fuzzer/BUILD.gn @@ -66,6 +66,7 @@ ohos_fuzztest("DeviceListFuzzTest") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"DeviceListFuzzTest\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] external_deps = [ diff --git a/test/servicesfuzztest/devicelistrefresh_fuzzer/BUILD.gn b/test/servicesfuzztest/devicelistrefresh_fuzzer/BUILD.gn index e8f649163..732fedf1e 100644 --- a/test/servicesfuzztest/devicelistrefresh_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/devicelistrefresh_fuzzer/BUILD.gn @@ -65,6 +65,7 @@ ohos_fuzztest("DeviceListRefreshFuzzTest") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"DeviceListRefreshFuzzTest\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] external_deps = [ diff --git a/test/servicesfuzztest/devicemanagernotify_fuzzer/BUILD.gn b/test/servicesfuzztest/devicemanagernotify_fuzzer/BUILD.gn index d0a50b7ff..8427bb5ae 100644 --- a/test/servicesfuzztest/devicemanagernotify_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/devicemanagernotify_fuzzer/BUILD.gn @@ -75,6 +75,7 @@ ohos_fuzztest("DeviceManagerNotifyFuzzTest") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"DeviceManagerNotifyFuzzTest\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] } diff --git a/test/servicesfuzztest/devicemanagerservice_fuzzer/BUILD.gn b/test/servicesfuzztest/devicemanagerservice_fuzzer/BUILD.gn index 160628a41..c2d76c6f9 100644 --- a/test/servicesfuzztest/devicemanagerservice_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/devicemanagerservice_fuzzer/BUILD.gn @@ -66,11 +66,11 @@ ohos_fuzztest("DeviceManagerServiceFuzzTest") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"DeviceManagerServiceFuzzTest\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] external_deps = [ "ability_base:want", - "cJSON:cjson", "device_auth:deviceauth_sdk", "device_info_manager:distributed_device_profile_common", "device_info_manager:distributed_device_profile_sdk", diff --git a/test/servicesfuzztest/devicenamemanager_fuzzer/BUILD.gn b/test/servicesfuzztest/devicenamemanager_fuzzer/BUILD.gn index e769025ec..913bc505b 100644 --- a/test/servicesfuzztest/devicenamemanager_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/devicenamemanager_fuzzer/BUILD.gn @@ -70,6 +70,7 @@ ohos_fuzztest("DeviceNameManagerFuzzTest") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"DeviceNameManagerFuzzTest\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] external_deps = [ diff --git a/test/servicesfuzztest/deviceprofileconnector_fuzzer/BUILD.gn b/test/servicesfuzztest/deviceprofileconnector_fuzzer/BUILD.gn index 8c61184f5..aa336a977 100644 --- a/test/servicesfuzztest/deviceprofileconnector_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/deviceprofileconnector_fuzzer/BUILD.gn @@ -51,6 +51,7 @@ ohos_fuzztest("DeviceProfileConnectorFuzzTest") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"DeviceProfileConnectorFuzzTest\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] } diff --git a/test/servicesfuzztest/devicepublish_fuzzer/BUILD.gn b/test/servicesfuzztest/devicepublish_fuzzer/BUILD.gn index 52a8b23f3..1e77527fb 100644 --- a/test/servicesfuzztest/devicepublish_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/devicepublish_fuzzer/BUILD.gn @@ -69,6 +69,7 @@ ohos_fuzztest("DevicePublishFuzzTest") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"DevicePublishFuzzTest\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] external_deps = [ diff --git a/test/servicesfuzztest/dmadaptermanager_fuzzer/BUILD.gn b/test/servicesfuzztest/dmadaptermanager_fuzzer/BUILD.gn index 6aacb226d..91ad6df1e 100644 --- a/test/servicesfuzztest/dmadaptermanager_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/dmadaptermanager_fuzzer/BUILD.gn @@ -58,6 +58,7 @@ ohos_fuzztest("DmAdapterManagerFuzzTest") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"DmAdapterManagerFuzzTest\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] external_deps = [ diff --git a/test/servicesfuzztest/dmcommtool_fuzzer/BUILD.gn b/test/servicesfuzztest/dmcommtool_fuzzer/BUILD.gn index 1b4f684c6..621e5f93c 100644 --- a/test/servicesfuzztest/dmcommtool_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/dmcommtool_fuzzer/BUILD.gn @@ -70,10 +70,10 @@ ohos_fuzztest("DmCommToolFuzzTest") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"DmCommToolFuzzTest\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] external_deps = [ - "cJSON:cjson", "device_auth:deviceauth_sdk", "dsoftbus:softbus_client", "eventhandler:libeventhandler", diff --git a/test/servicesfuzztest/dmtransport_fuzzer/BUILD.gn b/test/servicesfuzztest/dmtransport_fuzzer/BUILD.gn index d1c54b3c8..61d6d4a9f 100644 --- a/test/servicesfuzztest/dmtransport_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/dmtransport_fuzzer/BUILD.gn @@ -70,10 +70,10 @@ ohos_fuzztest("DmTransPortFuzzTest") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"DmTransPortFuzzTest\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] external_deps = [ - "cJSON:cjson", "device_auth:deviceauth_sdk", "dsoftbus:softbus_client", "eventhandler:libeventhandler", diff --git a/test/servicesfuzztest/dmtransportmsg_fuzzer/BUILD.gn b/test/servicesfuzztest/dmtransportmsg_fuzzer/BUILD.gn index 0c957e148..b8134aa1a 100644 --- a/test/servicesfuzztest/dmtransportmsg_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/dmtransportmsg_fuzzer/BUILD.gn @@ -32,6 +32,7 @@ ohos_fuzztest("DmTransPortMsgFuzzTest") { "${common_path}/include/ipc", "${common_path}/include/ipc/model", "${utils_path}/include/ipc/standard", + "${json_path}/include", "${servicesimpl_path}/include", "${servicesimpl_path}/include/dependency/timer", "${servicesimpl_path}/include/discovery", @@ -63,6 +64,7 @@ ohos_fuzztest("DmTransPortMsgFuzzTest") { deps = [ "${devicemanager_path}/services/service:devicemanagerservicetest", + "${json_path}:devicemanagerjson", "${utils_path}:devicemanagerutilstest", ] @@ -70,10 +72,10 @@ ohos_fuzztest("DmTransPortMsgFuzzTest") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"DmTransPortMsgFuzzTest\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] external_deps = [ - "cJSON:cjson", "device_auth:deviceauth_sdk", "dsoftbus:softbus_client", "eventhandler:libeventhandler", diff --git a/test/servicesfuzztest/dmtransportmsg_fuzzer/dm_transport_msg_fuzzer.cpp b/test/servicesfuzztest/dmtransportmsg_fuzzer/dm_transport_msg_fuzzer.cpp index fa52cb012..969d7f805 100644 --- a/test/servicesfuzztest/dmtransportmsg_fuzzer/dm_transport_msg_fuzzer.cpp +++ b/test/servicesfuzztest/dmtransportmsg_fuzzer/dm_transport_msg_fuzzer.cpp @@ -23,12 +23,12 @@ #include "dm_transport_msg.h" #include "dm_transport_msg_fuzzer.h" #include "dm_comm_tool.h" -#include "cJSON.h" +#include "dm_cJSON.h" namespace OHOS { namespace DistributedHardware { - +using namespace DmJson; namespace { constexpr uint32_t FORUSERID = 10; constexpr uint32_t BACKUSERID = 20; diff --git a/test/servicesfuzztest/dpinitcallback_fuzzer/BUILD.gn b/test/servicesfuzztest/dpinitcallback_fuzzer/BUILD.gn index ede053466..065ea7dba 100644 --- a/test/servicesfuzztest/dpinitcallback_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/dpinitcallback_fuzzer/BUILD.gn @@ -63,6 +63,7 @@ ohos_fuzztest("DpInitCallbackFuzzTest") { deps = [ "${devicemanager_path}/services/implementation:devicemanagerserviceimpl", "${innerkits_path}/native_cpp:devicemanagersdk", + "${json_path}:devicemanagerjson", "${utils_path}:devicemanagerutilstest", ] @@ -70,6 +71,7 @@ ohos_fuzztest("DpInitCallbackFuzzTest") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"DpInitCallbackFuzzTest\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] external_deps = [ diff --git a/test/servicesfuzztest/getlocaldeviceinfo_fuzzer/BUILD.gn b/test/servicesfuzztest/getlocaldeviceinfo_fuzzer/BUILD.gn index f90940c28..f11f91f3d 100644 --- a/test/servicesfuzztest/getlocaldeviceinfo_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/getlocaldeviceinfo_fuzzer/BUILD.gn @@ -50,6 +50,7 @@ ohos_fuzztest("GetLocalDeviceInfoFuzzTest") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"GetLocalDeviceInfoFuzzTest\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] external_deps = [ diff --git a/test/servicesfuzztest/gettrusteddevicelistservice_fuzzer/BUILD.gn b/test/servicesfuzztest/gettrusteddevicelistservice_fuzzer/BUILD.gn index 78697ead4..b1104c112 100644 --- a/test/servicesfuzztest/gettrusteddevicelistservice_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/gettrusteddevicelistservice_fuzzer/BUILD.gn @@ -64,7 +64,6 @@ ohos_fuzztest("GetTrustedDeviceListServiceFuzzTest") { external_deps = [ "ability_base:want", - "cJSON:cjson", "device_auth:deviceauth_sdk", "device_info_manager:distributed_device_profile_common", "device_info_manager:distributed_device_profile_sdk", @@ -79,6 +78,7 @@ ohos_fuzztest("GetTrustedDeviceListServiceFuzzTest") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"GetTrustedDeviceListServiceFuzzTest\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] } diff --git a/test/servicesfuzztest/getudidbynetworkid_fuzzer/BUILD.gn b/test/servicesfuzztest/getudidbynetworkid_fuzzer/BUILD.gn index 380474c9d..07bacb78a 100644 --- a/test/servicesfuzztest/getudidbynetworkid_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/getudidbynetworkid_fuzzer/BUILD.gn @@ -64,6 +64,7 @@ ohos_fuzztest("GetUdidByNetworkIdFuzzTest") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"GetUdidByNetworkIdFuzzTest\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] external_deps = [ diff --git a/test/servicesfuzztest/getuuidbynetworkid_fuzzer/BUILD.gn b/test/servicesfuzztest/getuuidbynetworkid_fuzzer/BUILD.gn index 6f32db722..825165818 100644 --- a/test/servicesfuzztest/getuuidbynetworkid_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/getuuidbynetworkid_fuzzer/BUILD.gn @@ -64,6 +64,7 @@ ohos_fuzztest("GetUuidByNetworkIdFuzzTest") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"GetUuidByNetworkIdFuzzTest\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] external_deps = [ diff --git a/test/servicesfuzztest/initdevicemanager_fuzzer/BUILD.gn b/test/servicesfuzztest/initdevicemanager_fuzzer/BUILD.gn index 800fcc952..6fbce608f 100644 --- a/test/servicesfuzztest/initdevicemanager_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/initdevicemanager_fuzzer/BUILD.gn @@ -58,6 +58,7 @@ ohos_fuzztest("InitDeviceManagerFuzzTest") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"InitDeviceManagerFuzzTest\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] external_deps = [ diff --git a/test/servicesfuzztest/ipcclientmanager_fuzzer/BUILD.gn b/test/servicesfuzztest/ipcclientmanager_fuzzer/BUILD.gn index 04ab3d102..9152d2a2d 100644 --- a/test/servicesfuzztest/ipcclientmanager_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/ipcclientmanager_fuzzer/BUILD.gn @@ -67,6 +67,7 @@ ohos_fuzztest("IpcClientManagerFuzzTest") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"IpcClientManagerFuzzTest\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] external_deps = [ diff --git a/test/servicesfuzztest/ipccmdregister_fuzzer/BUILD.gn b/test/servicesfuzztest/ipccmdregister_fuzzer/BUILD.gn index 30ec45605..09cacd703 100644 --- a/test/servicesfuzztest/ipccmdregister_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/ipccmdregister_fuzzer/BUILD.gn @@ -65,6 +65,7 @@ ohos_fuzztest("IpcCmdRegisterFuzzTest") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"IpcCmdRegisterFuzzTest\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] deps = [ "${innerkits_path}/native_cpp:devicemanagersdk" ] diff --git a/test/servicesfuzztest/ipcserverclientproxy_fuzzer/BUILD.gn b/test/servicesfuzztest/ipcserverclientproxy_fuzzer/BUILD.gn index 0382de7c2..dcd3ea5db 100644 --- a/test/servicesfuzztest/ipcserverclientproxy_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/ipcserverclientproxy_fuzzer/BUILD.gn @@ -68,6 +68,7 @@ ohos_fuzztest("IpcServerClientProxyFuzzTest") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"IpcServerClientProxyFuzzTest\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] external_deps = [ diff --git a/test/servicesfuzztest/ipcserverlistener_fuzzer/BUILD.gn b/test/servicesfuzztest/ipcserverlistener_fuzzer/BUILD.gn index 1e442b1ff..ae000d2b4 100644 --- a/test/servicesfuzztest/ipcserverlistener_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/ipcserverlistener_fuzzer/BUILD.gn @@ -74,6 +74,7 @@ ohos_fuzztest("IpcServerListenerFuzzTest") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"IpcServerListenerFuzzTest\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] } diff --git a/test/servicesfuzztest/ipcserverstub_fuzzer/BUILD.gn b/test/servicesfuzztest/ipcserverstub_fuzzer/BUILD.gn index feb970445..06425ca97 100644 --- a/test/servicesfuzztest/ipcserverstub_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/ipcserverstub_fuzzer/BUILD.gn @@ -66,6 +66,7 @@ ohos_fuzztest("IpcServerStubFuzzTest") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"IpcServerStubFuzzTest\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] external_deps = [ diff --git a/test/servicesfuzztest/notifyevent_fuzzer/BUILD.gn b/test/servicesfuzztest/notifyevent_fuzzer/BUILD.gn index dfd1270d5..cda769a4f 100644 --- a/test/servicesfuzztest/notifyevent_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/notifyevent_fuzzer/BUILD.gn @@ -56,6 +56,7 @@ ohos_fuzztest("NotifyEventFuzzTest") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"NotifyEventFuzzTest\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] } diff --git a/test/servicesfuzztest/registerdevicemanagerfacallback_fuzzer/BUILD.gn b/test/servicesfuzztest/registerdevicemanagerfacallback_fuzzer/BUILD.gn index 9db7b0d3d..2e09cfb50 100644 --- a/test/servicesfuzztest/registerdevicemanagerfacallback_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/registerdevicemanagerfacallback_fuzzer/BUILD.gn @@ -64,6 +64,7 @@ ohos_fuzztest("RegisterDeviceManagerFaCallbackFuzzTest") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"RegisterDeviceManagerFaCallbackFuzzTest\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] external_deps = [ diff --git a/test/servicesfuzztest/registerdevstatecallback_fuzzer/BUILD.gn b/test/servicesfuzztest/registerdevstatecallback_fuzzer/BUILD.gn index bef378127..431ad269a 100644 --- a/test/servicesfuzztest/registerdevstatecallback_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/registerdevstatecallback_fuzzer/BUILD.gn @@ -64,6 +64,7 @@ ohos_fuzztest("RegisterDevStateCallbackFuzzTest") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"RegisterDevStateCallbackFuzzTest\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] external_deps = [ diff --git a/test/servicesfuzztest/setuseroperation_fuzzer/BUILD.gn b/test/servicesfuzztest/setuseroperation_fuzzer/BUILD.gn index 6c09931f4..ed3daba7c 100644 --- a/test/servicesfuzztest/setuseroperation_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/setuseroperation_fuzzer/BUILD.gn @@ -64,6 +64,7 @@ ohos_fuzztest("SetUserOperationFuzzTest") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"SetUserOperationFuzzTest\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] external_deps = [ diff --git a/test/servicesfuzztest/shiftlnngeardeviceservice_fuzzer/BUILD.gn b/test/servicesfuzztest/shiftlnngeardeviceservice_fuzzer/BUILD.gn index fb7eeaba4..6c5daba15 100644 --- a/test/servicesfuzztest/shiftlnngeardeviceservice_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/shiftlnngeardeviceservice_fuzzer/BUILD.gn @@ -64,7 +64,6 @@ ohos_fuzztest("ShiftLNNGearDeviceServiceFuzzTest") { external_deps = [ "ability_base:want", - "cJSON:cjson", "device_auth:deviceauth_sdk", "device_info_manager:distributed_device_profile_common", "device_info_manager:distributed_device_profile_sdk", @@ -79,6 +78,7 @@ ohos_fuzztest("ShiftLNNGearDeviceServiceFuzzTest") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"ShiftLNNGearDeviceServiceFuzzTest\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] } diff --git a/test/servicesfuzztest/unauthenticatedevice_fuzzer/BUILD.gn b/test/servicesfuzztest/unauthenticatedevice_fuzzer/BUILD.gn index e84dc5c3d..67b9c93d9 100644 --- a/test/servicesfuzztest/unauthenticatedevice_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/unauthenticatedevice_fuzzer/BUILD.gn @@ -64,6 +64,7 @@ ohos_fuzztest("UnAuthenticateDeviceFuzzTest") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"UnAuthenticateDeviceFuzzTest\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] external_deps = [ diff --git a/test/servicesfuzztest/unregisterdevicemanagerfacallback_fuzzer/BUILD.gn b/test/servicesfuzztest/unregisterdevicemanagerfacallback_fuzzer/BUILD.gn index a2b11c116..6b9b1a8fe 100644 --- a/test/servicesfuzztest/unregisterdevicemanagerfacallback_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/unregisterdevicemanagerfacallback_fuzzer/BUILD.gn @@ -64,6 +64,7 @@ ohos_fuzztest("UnRegisterDeviceManagerFaCallbackFuzzTest") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"UnRegisterDeviceManagerFaCallbackFuzzTest\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] external_deps = [ diff --git a/test/softbusfuzztest/closedmradarhelperobj_fuzzer/BUILD.gn b/test/softbusfuzztest/closedmradarhelperobj_fuzzer/BUILD.gn index be65e803c..6f9081662 100644 --- a/test/softbusfuzztest/closedmradarhelperobj_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/closedmradarhelperobj_fuzzer/BUILD.gn @@ -57,6 +57,7 @@ ohos_fuzztest("CloseDmRadarHelperObjFuzzTest") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"CloseDmRadarHelperObjFuzzTest\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] } diff --git a/test/softbusfuzztest/onbytesreceived_fuzzer/BUILD.gn b/test/softbusfuzztest/onbytesreceived_fuzzer/BUILD.gn index 50307cab6..7dddcdf01 100644 --- a/test/softbusfuzztest/onbytesreceived_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/onbytesreceived_fuzzer/BUILD.gn @@ -69,6 +69,7 @@ ohos_fuzztest("OnBytesReceivedFuzzTest") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"OnBytesReceivedFuzzTest\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] } diff --git a/test/softbusfuzztest/onparameterchgcallback_fuzzer/BUILD.gn b/test/softbusfuzztest/onparameterchgcallback_fuzzer/BUILD.gn index 7ba953e6c..1a28b8c2f 100644 --- a/test/softbusfuzztest/onparameterchgcallback_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/onparameterchgcallback_fuzzer/BUILD.gn @@ -57,6 +57,7 @@ ohos_fuzztest("OnParameterChgCallbackFuzzTest") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"OnParameterChgCallbackFuzzTest\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] } diff --git a/test/softbusfuzztest/onsessionopened_fuzzer/BUILD.gn b/test/softbusfuzztest/onsessionopened_fuzzer/BUILD.gn index 680c3e943..df0fa3fac 100644 --- a/test/softbusfuzztest/onsessionopened_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/onsessionopened_fuzzer/BUILD.gn @@ -71,6 +71,7 @@ ohos_fuzztest("OnSessionOpenedFuzzTest") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"OnSessionOpenedFuzzTest\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] } diff --git a/test/softbusfuzztest/onsoftbusdevicefound_fuzzer/BUILD.gn b/test/softbusfuzztest/onsoftbusdevicefound_fuzzer/BUILD.gn index f960bcba3..7e3d09f8c 100644 --- a/test/softbusfuzztest/onsoftbusdevicefound_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/onsoftbusdevicefound_fuzzer/BUILD.gn @@ -50,7 +50,6 @@ ohos_fuzztest("OnSoftbusDeviceFoundFuzzTest") { ] external_deps = [ - "cJSON:cjson", "c_utils:utils", "dsoftbus:softbus_client", "safwk:system_ability_fwk", @@ -60,6 +59,7 @@ ohos_fuzztest("OnSoftbusDeviceFoundFuzzTest") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"OnSoftbusDeviceFoundFuzzTest\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] } diff --git a/test/softbusfuzztest/onsoftbusdeviceinfochanged_fuzzer/BUILD.gn b/test/softbusfuzztest/onsoftbusdeviceinfochanged_fuzzer/BUILD.gn index 420fe2276..4a642e2fc 100644 --- a/test/softbusfuzztest/onsoftbusdeviceinfochanged_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/onsoftbusdeviceinfochanged_fuzzer/BUILD.gn @@ -46,7 +46,6 @@ ohos_fuzztest("OnSoftbusDeviceInfoChangedFuzzTest") { ] external_deps = [ - "cJSON:cjson", "c_utils:utils", "device_auth:deviceauth_sdk", "device_info_manager:distributed_device_profile_common", @@ -62,6 +61,7 @@ ohos_fuzztest("OnSoftbusDeviceInfoChangedFuzzTest") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"OnSoftbusDeviceInfoChangedFuzzTest\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] } diff --git a/test/softbusfuzztest/onsoftbusdeviceoffline_fuzzer/BUILD.gn b/test/softbusfuzztest/onsoftbusdeviceoffline_fuzzer/BUILD.gn index aa9cd8d97..29f703d2f 100644 --- a/test/softbusfuzztest/onsoftbusdeviceoffline_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/onsoftbusdeviceoffline_fuzzer/BUILD.gn @@ -47,7 +47,6 @@ ohos_fuzztest("OnSoftbusDeviceOfflineFuzzTest") { ] external_deps = [ - "cJSON:cjson", "c_utils:utils", "device_auth:deviceauth_sdk", "device_info_manager:distributed_device_profile_common", @@ -63,6 +62,7 @@ ohos_fuzztest("OnSoftbusDeviceOfflineFuzzTest") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"OnSoftbusDeviceOfflineFuzzTest\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] } diff --git a/test/softbusfuzztest/onsoftbusdeviceonline_fuzzer/BUILD.gn b/test/softbusfuzztest/onsoftbusdeviceonline_fuzzer/BUILD.gn index 83ffef544..06c8065fe 100644 --- a/test/softbusfuzztest/onsoftbusdeviceonline_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/onsoftbusdeviceonline_fuzzer/BUILD.gn @@ -47,7 +47,6 @@ ohos_fuzztest("OnSoftbusDeviceOnlineFuzzTest") { ] external_deps = [ - "cJSON:cjson", "c_utils:utils", "device_auth:deviceauth_sdk", "device_info_manager:distributed_device_profile_common", @@ -63,6 +62,7 @@ ohos_fuzztest("OnSoftbusDeviceOnlineFuzzTest") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"OnSoftbusDeviceOnlineFuzzTest\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] } diff --git a/test/softbusfuzztest/onsoftbuslistenerdevicefound_fuzzer/BUILD.gn b/test/softbusfuzztest/onsoftbuslistenerdevicefound_fuzzer/BUILD.gn index fc2e6cd20..c194429a4 100644 --- a/test/softbusfuzztest/onsoftbuslistenerdevicefound_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/onsoftbuslistenerdevicefound_fuzzer/BUILD.gn @@ -46,7 +46,6 @@ ohos_fuzztest("OnSoftbusListenerDeviceFoundFuzzTest") { ] external_deps = [ - "cJSON:cjson", "c_utils:utils", "device_auth:deviceauth_sdk", "device_info_manager:distributed_device_profile_common", @@ -62,6 +61,7 @@ ohos_fuzztest("OnSoftbusListenerDeviceFoundFuzzTest") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"OnSoftbusListenerDeviceFoundFuzzTest\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] } diff --git a/test/softbusfuzztest/publishsoftbuslnn_fuzzer/BUILD.gn b/test/softbusfuzztest/publishsoftbuslnn_fuzzer/BUILD.gn index c3066fa50..b39db429a 100644 --- a/test/softbusfuzztest/publishsoftbuslnn_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/publishsoftbuslnn_fuzzer/BUILD.gn @@ -47,7 +47,6 @@ ohos_fuzztest("PublishSoftbusLnnFuzzTest") { ] external_deps = [ - "cJSON:cjson", "c_utils:utils", "device_auth:deviceauth_sdk", "device_info_manager:distributed_device_profile_common", @@ -63,6 +62,7 @@ ohos_fuzztest("PublishSoftbusLnnFuzzTest") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"PublishSoftbusLnnFuzzTest\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] } diff --git a/test/softbusfuzztest/refreshsoftbuslnn_fuzzer/BUILD.gn b/test/softbusfuzztest/refreshsoftbuslnn_fuzzer/BUILD.gn index 2a4a650e9..0d1f3a258 100644 --- a/test/softbusfuzztest/refreshsoftbuslnn_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/refreshsoftbuslnn_fuzzer/BUILD.gn @@ -47,7 +47,6 @@ ohos_fuzztest("RefreshSoftbusLnnFuzzTest") { ] external_deps = [ - "cJSON:cjson", "c_utils:utils", "device_auth:deviceauth_sdk", "device_info_manager:distributed_device_profile_common", @@ -63,6 +62,7 @@ ohos_fuzztest("RefreshSoftbusLnnFuzzTest") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"RefreshSoftbusLnnFuzzTest\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] } diff --git a/test/softbusfuzztest/softbusconnector_fuzzer/BUILD.gn b/test/softbusfuzztest/softbusconnector_fuzzer/BUILD.gn index cff815de9..571edcf51 100644 --- a/test/softbusfuzztest/softbusconnector_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/softbusconnector_fuzzer/BUILD.gn @@ -60,6 +60,7 @@ ohos_fuzztest("SoftbusConnectorFuzzTest") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"SoftbusConnectorFuzzTest\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] } diff --git a/test/softbusfuzztest/softbusconnectorcommon_fuzzer/BUILD.gn b/test/softbusfuzztest/softbusconnectorcommon_fuzzer/BUILD.gn index 4112453d5..b2660a05f 100644 --- a/test/softbusfuzztest/softbusconnectorcommon_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/softbusconnectorcommon_fuzzer/BUILD.gn @@ -60,6 +60,7 @@ ohos_fuzztest("SoftbusConnectorCommonFuzzTest") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"SoftbusConnectorCommonFuzzTest\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] } diff --git a/test/softbusfuzztest/softbusconnectorpublish_fuzzer/BUILD.gn b/test/softbusfuzztest/softbusconnectorpublish_fuzzer/BUILD.gn index 048f39fd9..9fabf87c8 100644 --- a/test/softbusfuzztest/softbusconnectorpublish_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/softbusconnectorpublish_fuzzer/BUILD.gn @@ -59,6 +59,7 @@ ohos_fuzztest("SoftbusConnectorPublishFuzzTest") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"SoftbusConnectorPublishFuzzTest\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] } diff --git a/test/softbusfuzztest/softbusconnectorregister_fuzzer/BUILD.gn b/test/softbusfuzztest/softbusconnectorregister_fuzzer/BUILD.gn index 7a89dc7d7..4ffdb5ef5 100644 --- a/test/softbusfuzztest/softbusconnectorregister_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/softbusconnectorregister_fuzzer/BUILD.gn @@ -60,6 +60,7 @@ ohos_fuzztest("SoftbusConnectorRegisterFuzzTest") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"SoftbusConnectorRegisterFuzzTest\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] } diff --git a/test/softbusfuzztest/softbusconnectorstate_fuzzer/BUILD.gn b/test/softbusfuzztest/softbusconnectorstate_fuzzer/BUILD.gn index a1d6a4c28..53f50fa3f 100644 --- a/test/softbusfuzztest/softbusconnectorstate_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/softbusconnectorstate_fuzzer/BUILD.gn @@ -60,6 +60,7 @@ ohos_fuzztest("SoftbusConnectorStateFuzzTest") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"SoftbusConnectorStateFuzzTest\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] } diff --git a/test/softbusfuzztest/softbusconnectorstatic_fuzzer/BUILD.gn b/test/softbusfuzztest/softbusconnectorstatic_fuzzer/BUILD.gn index ef1a119c6..8151476eb 100644 --- a/test/softbusfuzztest/softbusconnectorstatic_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/softbusconnectorstatic_fuzzer/BUILD.gn @@ -60,6 +60,7 @@ ohos_fuzztest("SoftbusConnectorStaticFuzzTest") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"SoftbusConnectorStaticFuzzTest\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] } diff --git a/test/softbusfuzztest/softbuslistener_fuzzer/BUILD.gn b/test/softbusfuzztest/softbuslistener_fuzzer/BUILD.gn index 50dcc4ded..5be08984b 100644 --- a/test/softbusfuzztest/softbuslistener_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/softbuslistener_fuzzer/BUILD.gn @@ -46,12 +46,12 @@ ohos_fuzztest("SoftbusListenerFuzzTest") { deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", + "${json_path}:devicemanagerjson", "${services_path}:devicemanagerservicetest", "${servicesimpl_path}:devicemanagerserviceimpl", ] external_deps = [ - "cJSON:cjson", "c_utils:utils", "device_auth:deviceauth_sdk", "device_info_manager:distributed_device_profile_common", @@ -67,6 +67,7 @@ ohos_fuzztest("SoftbusListenerFuzzTest") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"SoftbusListenerFuzzTest\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] } diff --git a/test/softbusfuzztest/softbuslistenergetlocaldeviceinfo_fuzzer/BUILD.gn b/test/softbusfuzztest/softbuslistenergetlocaldeviceinfo_fuzzer/BUILD.gn index 46986b2f8..411951036 100644 --- a/test/softbusfuzztest/softbuslistenergetlocaldeviceinfo_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/softbuslistenergetlocaldeviceinfo_fuzzer/BUILD.gn @@ -50,7 +50,6 @@ ohos_fuzztest("SoftbusListenerGetLocalDeviceInfoFuzzTest") { external_deps = [ "access_token:libaccesstoken_sdk", "access_token:libtokenid_sdk", - "cJSON:cjson", "c_utils:utils", "device_auth:deviceauth_sdk", "device_info_manager:distributed_device_profile_common", @@ -67,6 +66,7 @@ ohos_fuzztest("SoftbusListenerGetLocalDeviceInfoFuzzTest") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"SoftbusListenerGetLocalDeviceInfoFuzzTest\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] } diff --git a/test/softbusfuzztest/softbussession_fuzzer/BUILD.gn b/test/softbusfuzztest/softbussession_fuzzer/BUILD.gn index f31b185a1..d58d41e9c 100644 --- a/test/softbusfuzztest/softbussession_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/softbussession_fuzzer/BUILD.gn @@ -60,6 +60,7 @@ ohos_fuzztest("SoftbusSessionFuzzTest") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"SoftbusSessionFuzzTest\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] } diff --git a/test/softbusfuzztest/softbussessionobject_fuzzer/BUILD.gn b/test/softbusfuzztest/softbussessionobject_fuzzer/BUILD.gn index 08fea482c..2010752de 100644 --- a/test/softbusfuzztest/softbussessionobject_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/softbussessionobject_fuzzer/BUILD.gn @@ -61,6 +61,7 @@ ohos_fuzztest("SoftbusSessionObjectFuzzTest") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"SoftbusSessionObjectFuzzTest\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] } diff --git a/test/softbusfuzztest/stoprefreshsoftbuslnn_fuzzer/BUILD.gn b/test/softbusfuzztest/stoprefreshsoftbuslnn_fuzzer/BUILD.gn index c844e2e0c..62a8e8d92 100644 --- a/test/softbusfuzztest/stoprefreshsoftbuslnn_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/stoprefreshsoftbuslnn_fuzzer/BUILD.gn @@ -47,7 +47,6 @@ ohos_fuzztest("StopRefreshSoftbusLnnFuzzTest") { ] external_deps = [ - "cJSON:cjson", "c_utils:utils", "device_auth:deviceauth_sdk", "device_info_manager:distributed_device_profile_common", @@ -63,6 +62,7 @@ ohos_fuzztest("StopRefreshSoftbusLnnFuzzTest") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"StopRefreshSoftbusLnnFuzzTest\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] } diff --git a/test/unittest/BUILD.gn b/test/unittest/BUILD.gn index 4a79508f4..01d95d171 100644 --- a/test/unittest/BUILD.gn +++ b/test/unittest/BUILD.gn @@ -108,7 +108,6 @@ ohos_unittest("UTTest_pin_auth") { deps = [ ":device_manager_test_common" ] external_deps = [ - "cJSON:cjson", "data_share:datashare_common", "data_share:datashare_consumer", "device_auth:deviceauth_sdk", @@ -198,7 +197,6 @@ ohos_unittest("UTTest_ipc_cmd_parser_service") { deps = [ ":device_manager_test_common" ] external_deps = [ - "cJSON:cjson", "data_share:datashare_common", "data_share:datashare_consumer", "device_auth:deviceauth_sdk", @@ -377,7 +375,6 @@ ohos_unittest("UTTest_device_manager_service") { "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", - "cJSON:cjson", "device_auth:deviceauth_sdk", "device_info_manager:distributed_device_profile_common", "device_info_manager:distributed_device_profile_sdk", @@ -404,7 +401,6 @@ ohos_unittest("UTTest_dm_softbus_cache") { "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", - "cJSON:cjson", "device_auth:deviceauth_sdk", "device_info_manager:distributed_device_profile_common", "device_info_manager:distributed_device_profile_sdk", @@ -436,7 +432,6 @@ ohos_unittest("UTTest_device_manager_service_three") { "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", - "cJSON:cjson", "device_auth:deviceauth_sdk", "device_info_manager:distributed_device_profile_common", "device_info_manager:distributed_device_profile_sdk", @@ -462,7 +457,6 @@ ohos_unittest("UTTest_device_manager_service_notify") { "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", - "cJSON:cjson", "device_auth:deviceauth_sdk", "device_info_manager:distributed_device_profile_common", "device_info_manager:distributed_device_profile_sdk", @@ -564,7 +558,6 @@ ohos_unittest("UTTest_mine_softbus_listener") { external_deps = [ "ability_base:want", "ability_runtime:ability_manager", - "cJSON:cjson", "device_auth:deviceauth_sdk", "device_info_manager:distributed_device_profile_common", "device_info_manager:distributed_device_profile_sdk", @@ -595,7 +588,6 @@ ohos_unittest("UTTest_softbus_connector") { deps = [ ":device_manager_test_common" ] external_deps = [ - "cJSON:cjson", "device_auth:deviceauth_sdk", "device_info_manager:distributed_device_profile_common", "device_info_manager:distributed_device_profile_sdk", @@ -634,7 +626,6 @@ ohos_unittest("UTTest_softbus_listener") { deps = [ ":device_manager_test_common" ] external_deps = [ - "cJSON:cjson", "device_auth:deviceauth_sdk", "device_info_manager:distributed_device_profile_common", "device_info_manager:distributed_device_profile_sdk", @@ -667,7 +658,6 @@ ohos_unittest("UTTest_softbus_listener_two") { deps = [ ":device_manager_test_common" ] external_deps = [ - "cJSON:cjson", "device_auth:deviceauth_sdk", "device_info_manager:distributed_device_profile_common", "device_info_manager:distributed_device_profile_sdk", @@ -807,7 +797,6 @@ ohos_unittest("UTTest_dm_transport") { sources = [ "${devicemanager_path}/test/unittest/UTTest_dm_transport.cpp" ] deps = [ ":device_manager_test_common" ] external_deps = [ - "cJSON:cjson", "dsoftbus:softbus_client", "eventhandler:libeventhandler", "googletest:gmock", @@ -825,7 +814,6 @@ ohos_unittest("UTTest_dm_transport_msg") { [ "${devicemanager_path}/test/unittest/UTTest_dm_transport_msg.cpp" ] deps = [ ":device_manager_test_common" ] external_deps = [ - "cJSON:cjson", "googletest:gmock", "hilog:libhilog", ] @@ -917,7 +905,6 @@ ohos_unittest("UTTest_ipc_server_client_proxy") { deps = [ ":device_manager_test_common" ] external_deps = [ - "cJSON:cjson", "data_share:datashare_common", "data_share:datashare_consumer", "device_auth:deviceauth_sdk", @@ -943,7 +930,6 @@ ohos_unittest("UTTest_ipc_server_listener") { deps = [ ":device_manager_test_common" ] external_deps = [ - "cJSON:cjson", "data_share:datashare_common", "data_share:datashare_consumer", "device_auth:deviceauth_sdk", @@ -964,7 +950,6 @@ ohos_unittest("UTTest_ipc_server_stub") { deps = [ ":device_manager_test_common" ] external_deps = [ - "cJSON:cjson", "data_share:datashare_common", "data_share:datashare_consumer", "device_auth:deviceauth_sdk", @@ -1079,7 +1064,6 @@ ohos_unittest("UTTest_permission_manager") { "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", - "cJSON:cjson", "device_auth:deviceauth_sdk", "googletest:gmock", "googletest:gmock_main", @@ -1545,7 +1529,6 @@ ohos_unittest("UTTest_discovery_manager") { deps = [ ":device_manager_test_common" ] external_deps = [ - "cJSON:cjson", "device_auth:deviceauth_sdk", "device_info_manager:distributed_device_profile_common", "device_info_manager:distributed_device_profile_sdk", @@ -1654,7 +1637,6 @@ ohos_unittest("UTTest_dm_comm_tool") { ] deps = [ ":device_manager_test_common" ] external_deps = [ - "cJSON:cjson", "dsoftbus:softbus_client", "eventhandler:libeventhandler", "googletest:gmock", @@ -1753,10 +1735,7 @@ ohos_unittest("UTTest_relationship_sync_mgr") { deps = [ ":device_manager_test_common" ] - external_deps = [ - "cJSON:cjson", - "hilog:libhilog", - ] + external_deps = [ "hilog:libhilog" ] } ## UnitTest UTTest_relationship_sync_mgr }}} @@ -1772,10 +1751,7 @@ ohos_unittest("UTTest_hichain_listener") { deps = [ ":device_manager_test_common" ] - external_deps = [ - "cJSON:cjson", - "hilog:libhilog", - ] + external_deps = [ "hilog:libhilog" ] } ## UnitTest UTTest_hichain_listener }}} @@ -1912,7 +1888,6 @@ ohos_unittest("UTTest_device_name_manager") { deps = [ ":device_manager_test_common" ] external_deps = [ - "cJSON:cjson", "data_share:datashare_common", "data_share:datashare_consumer", "googletest:gmock", @@ -1942,7 +1917,6 @@ ohos_unittest("UTTest_advertise_manager") { deps = [ ":device_manager_test_common" ] external_deps = [ - "cJSON:cjson", "device_info_manager:distributed_device_profile_common", "device_info_manager:distributed_device_profile_sdk", "dsoftbus:softbus_client", @@ -1965,7 +1939,6 @@ ohos_unittest("UTTest_json_object") { deps = [ ":device_manager_test_common" ] external_deps = [ - "cJSON:cjson", "ffrt:libffrt", "googletest:gmock", "googletest:gmock_main", @@ -1991,6 +1964,7 @@ config("device_manager_test_common_public_config") { "${utils_path}/include/crypto", "${utils_path}/include/fwkload/standard", "${utils_path}/include/timer", + "${json_path}/include", "${servicesimpl_path}/include", "${servicesimpl_path}/include/credential", "${servicesimpl_path}/include/discovery", @@ -2024,6 +1998,7 @@ config("device_manager_test_common_public_config") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"device_manager_UTtest\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] } @@ -2048,6 +2023,7 @@ ohos_static_library("device_manager_test_common") { "${devicemanager_path}/radar:devicemanagerradartest", "${ext_path}/pin_auth:devicemanagerext_pin_auth", "${innerkits_path}/native_cpp:devicemanagersdk", + "${json_path}:devicemanagerjson", "${services_path}:devicemanagerservicetest", "${servicesimpl_path}:devicemanagerserviceimpl", "${softbuscache_parh}:dmdevicecache", @@ -2059,7 +2035,6 @@ ohos_static_library("device_manager_test_common") { "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", - "cJSON:cjson", "c_utils:utils", "common_event_service:cesfwk_core", "common_event_service:cesfwk_innerkits", diff --git a/test/unittest/UTTest_json_object.cpp b/test/unittest/UTTest_json_object.cpp index dfd6c422f..62c8873ef 100644 --- a/test/unittest/UTTest_json_object.cpp +++ b/test/unittest/UTTest_json_object.cpp @@ -285,7 +285,7 @@ HWTEST_F(JsonObjectTest, Parse_003, testing::ext::TestSize.Level1) if (!ret) { EXPECT_TRUE(object["TEST1"].IsNumber()); EXPECT_TRUE(object["TEST2"].IsNumber()); - EXPECT_TRUE(object["TEST1"].IsNumberInteger()); + EXPECT_FALSE(object["TEST1"].IsNumberInteger()); EXPECT_FALSE(object["TEST2"].IsNumberInteger()); } } @@ -568,5 +568,38 @@ HWTEST_F(JsonObjectTest, Get_016, testing::ext::TestSize.Level1) EXPECT_EQ(object1["TEST4"].Get(), true); } } + +HWTEST_F(JsonObjectTest, Get_017, testing::ext::TestSize.Level1) +{ + std::string strJson = R"({"VALUE1":319691941099823986, "VALUE2":-319691941099823986})"; + JsonObject object(strJson); + bool ret = object.IsDiscarded(); + EXPECT_FALSE(ret); + if (!ret) { + int64_t value1 = object["VALUE1"].Get(); + int64_t value2 = object["VALUE2"].Get(); + int64_t checkValue1 = 319691941099823986; + int64_t checkValue2 = -319691941099823986; + EXPECT_EQ(value1, checkValue1); + EXPECT_EQ(value2, checkValue2); + } +} + +HWTEST_F(JsonObjectTest, Get_018, testing::ext::TestSize.Level1) +{ + std::string strJson = R"({"Values":[319691941099823986, -319691941099823986, 419691941099823986]})"; + JsonObject object(strJson); + bool ret = object.IsDiscarded(); + EXPECT_FALSE(ret); + if (!ret) { + std::vector verValues; + object["Values"].Get(verValues); + std::vector verCheckValues = {319691941099823986, -319691941099823986, 419691941099823986}; + EXPECT_EQ(verValues, verCheckValues); + for (size_t i = 0; i < verValues.size() && i < verCheckValues.size(); ++i) { + EXPECT_EQ(verValues[i], verCheckValues[i]); + } + } +} } // namespace DistributedHardware } // namespace OHOS \ No newline at end of file diff --git a/utils/BUILD.gn b/utils/BUILD.gn index 3c679b63b..56deeecf3 100644 --- a/utils/BUILD.gn +++ b/utils/BUILD.gn @@ -36,7 +36,7 @@ if (defined(ohos_lite)) { "${common_path}/include/ipc/model", "${innerkits_path}/native_cpp/include", "${interfaces_path}/c/ipc/include", - "//third_party/cJSON", + "${json_path}/include", "//third_party/bounds_checking_function/include", ] @@ -47,7 +47,6 @@ if (defined(ohos_lite)) { "${common_path}/src/dm_anonymous.cpp", "${common_path}/src/dm_error_message.cpp", "${common_path}/src/ipc/lite/ipc_cmd_register.cpp", - "${common_path}/src/json_object.cpp", "src/appInfo/lite/app_manager.cpp", "src/crypto/dm_crypto.cpp", "src/dm_random.cpp", @@ -62,7 +61,10 @@ if (defined(ohos_lite)) { "lOG_DOMAIN=0xD004110", ] - deps = [ "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared" ] + deps = [ + "${json_path}:devicemanagerjson", + "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", + ] external_deps = [ "bounds_checking_function:libsec_shared", "openssl:libcrypto_shared", @@ -80,6 +82,7 @@ if (defined(ohos_lite)) { "include/timer", "${innerkits_path}/native_cpp/include", "${common_path}/include", + "${json_path}/include", ] } config("cflags_config") { @@ -122,7 +125,6 @@ if (defined(ohos_lite)) { sources = [ "${common_path}/src/dm_anonymous.cpp", - "${common_path}/src/json_object.cpp", "src/appInfo/standard/app_manager.cpp", "src/crypto/dm_crypto.cpp", "src/dm_random.cpp", @@ -142,14 +144,16 @@ if (defined(ohos_lite)) { "HI_LOG_ENABLE", "DH_LOG_TAG=\"devicemanagerutils\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] + deps = [ "${json_path}:devicemanagerjson" ] + external_deps = [ "access_token:libaccesstoken_sdk", "access_token:libtokenid_sdk", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", - "cJSON:cjson", "c_utils:utils", "eventhandler:libeventhandler", "ffrt:libffrt", @@ -163,7 +167,6 @@ if (defined(ohos_lite)) { public_external_deps = [ "bundle_framework:appexecfwk_core", - "cJSON:cjson", "kv_store:distributeddata_inner", ] @@ -201,7 +204,6 @@ if (defined(ohos_lite)) { sources = [ "${common_path}/src/dm_anonymous.cpp", - "${common_path}/src/json_object.cpp", "src/appInfo/standard/app_manager.cpp", "src/crypto/dm_crypto.cpp", "src/dm_random.cpp", @@ -221,14 +223,16 @@ if (defined(ohos_lite)) { "HI_LOG_ENABLE", "DH_LOG_TAG=\"devicemanagerutils\"", "LOG_DOMAIN=0xD004110", + "__CJSON_USE_INT64", ] + deps = [ "${json_path}:devicemanagerjson" ] + external_deps = [ "access_token:libaccesstoken_sdk", "access_token:libtokenid_sdk", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", - "cJSON:cjson", "c_utils:utils", "eventhandler:libeventhandler", "ffrt:libffrt", @@ -242,7 +246,6 @@ if (defined(ohos_lite)) { public_external_deps = [ "bundle_framework:appexecfwk_core", - "cJSON:cjson", "kv_store:distributeddata_inner", ] diff --git a/utils/src/kvadapter/dm_kv_info.cpp b/utils/src/kvadapter/dm_kv_info.cpp index 8c880bd49..2c4449c8c 100644 --- a/utils/src/kvadapter/dm_kv_info.cpp +++ b/utils/src/kvadapter/dm_kv_info.cpp @@ -14,11 +14,12 @@ */ #include "dm_kv_info.h" -#include "cJSON.h" +#include "dm_cJSON.h" #include "dm_anonymous.h" namespace OHOS { namespace DistributedHardware { +using namespace DmJson; constexpr const char* UDID_HASH_KEY = "udidHash"; constexpr const char* APP_ID_KEY = "appID"; constexpr const char* ANOY_DEVICE_ID_KEY = "anoyDeviceId"; diff --git a/utils/src/kvadapter/kv_adapter.cpp b/utils/src/kvadapter/kv_adapter.cpp index 8d7dd41dd..2e8f4a667 100644 --- a/utils/src/kvadapter/kv_adapter.cpp +++ b/utils/src/kvadapter/kv_adapter.cpp @@ -18,7 +18,7 @@ #include #include -#include "cJSON.h" +#include "dm_cJSON.h" #include "datetime_ex.h" #include "string_ex.h" @@ -30,6 +30,7 @@ namespace OHOS { namespace DistributedHardware { using namespace OHOS::DistributedKv; +using namespace DmJson; namespace { const std::string APP_ID = "distributed_device_manager_service"; const std::string STORE_ID = "dm_kv_store"; -- Gitee From a6d88041b75cbfeb04e5262845ee173f2670e084 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=B7=8D?= Date: Wed, 2 Apr 2025 15:54:21 +0800 Subject: [PATCH 2/2] =?UTF-8?q?cjson=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 李巍 --- json/include/dm_cJSON.h | 21 --------------------- json/src/dm_cJSON.cpp | 25 ------------------------- 2 files changed, 46 deletions(-) diff --git a/json/include/dm_cJSON.h b/json/include/dm_cJSON.h index 92870a0d8..097e25012 100644 --- a/json/include/dm_cJSON.h +++ b/json/include/dm_cJSON.h @@ -13,27 +13,6 @@ * limitations under the License. */ -/* - Copyright (c) 2009-2017 Dave Gamble and cJSON contributors - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. -*/ - #ifndef DM_CJSON_H #define DM_CJSON_H diff --git a/json/src/dm_cJSON.cpp b/json/src/dm_cJSON.cpp index ed5cd36eb..17018adfa 100644 --- a/json/src/dm_cJSON.cpp +++ b/json/src/dm_cJSON.cpp @@ -13,31 +13,6 @@ * limitations under the License. */ -/* - Copyright (c) 2009-2017 Dave Gamble and cJSON contributors - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. -*/ - -/* cJSON */ -/* JSON parser in C. */ - -/* disable warnings about old C89 functions in MSVC */ #if !defined(_CRT_SECURE_NO_DEPRECATE) && defined(_MSC_VER) #define _CRT_SECURE_NO_DEPRECATE #endif -- Gitee