From d614091978d0ced27c6811a04732cd3a050bb7f9 Mon Sep 17 00:00:00 2001 From: rashmy Date: Fri, 28 Sep 2018 15:16:45 -0700 Subject: [PATCH 1/3] adding null check for cjson-delete --- source/code/providers/Container_Process_Class_Provider.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/source/code/providers/Container_Process_Class_Provider.cpp b/source/code/providers/Container_Process_Class_Provider.cpp index 9adc4edcd..e27df1788 100644 --- a/source/code/providers/Container_Process_Class_Provider.cpp +++ b/source/code/providers/Container_Process_Class_Provider.cpp @@ -163,7 +163,10 @@ class ContainerProcessQuery } } } - cJSON_Delete(dockerPsResponse[0]); + if (!dockerPsResponse.empty() && dockerPsResponse[0]) + { + cJSON_Delete(dockerPsResponse[0]); + } } catch (std::exception &e) { From 4d5f57c7738834ed123f3c3a32e9338fe5b6d6fd Mon Sep 17 00:00:00 2001 From: rashmy Date: Fri, 28 Sep 2018 15:26:10 -0700 Subject: [PATCH 2/3] null chk --- source/code/providers/Container_Process_Class_Provider.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/code/providers/Container_Process_Class_Provider.cpp b/source/code/providers/Container_Process_Class_Provider.cpp index e27df1788..e5e94467e 100644 --- a/source/code/providers/Container_Process_Class_Provider.cpp +++ b/source/code/providers/Container_Process_Class_Provider.cpp @@ -163,7 +163,7 @@ class ContainerProcessQuery } } } - if (!dockerPsResponse.empty() && dockerPsResponse[0]) + if (dockerPsResponse != NULL && !dockerPsResponse.empty() && dockerPsResponse[0]) { cJSON_Delete(dockerPsResponse[0]); } From 8558affc673dbed362c0fe106f699fd8b5526045 Mon Sep 17 00:00:00 2001 From: rashmy Date: Fri, 28 Sep 2018 15:31:40 -0700 Subject: [PATCH 3/3] removing null check --- source/code/providers/Container_Process_Class_Provider.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/code/providers/Container_Process_Class_Provider.cpp b/source/code/providers/Container_Process_Class_Provider.cpp index e5e94467e..e27df1788 100644 --- a/source/code/providers/Container_Process_Class_Provider.cpp +++ b/source/code/providers/Container_Process_Class_Provider.cpp @@ -163,7 +163,7 @@ class ContainerProcessQuery } } } - if (dockerPsResponse != NULL && !dockerPsResponse.empty() && dockerPsResponse[0]) + if (!dockerPsResponse.empty() && dockerPsResponse[0]) { cJSON_Delete(dockerPsResponse[0]); }