From 12de7782b2bac9bf603e903e17a96acaf2b0f90d Mon Sep 17 00:00:00 2001 From: Jiyong Min Date: Mon, 21 Nov 2016 12:46:05 +0900 Subject: [PATCH] Fix null pointer access which is dereferenced at DcmScanSvc.cpp:493, may have NULL value. Change-Id: I9ac4cd0b14b9e7b4dd0a1bd9a930e5b451a2c04c Signed-off-by: Jiyong Min --- src/DcmScanSvc.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/DcmScanSvc.cpp b/src/DcmScanSvc.cpp index 1d62944..57fe46b 100755 --- a/src/DcmScanSvc.cpp +++ b/src/DcmScanSvc.cpp @@ -453,6 +453,7 @@ int DcmScanSvc::ScanSingleItem(const char *file_path) int ret = DCM_SUCCESS; DcmScanItem *scan_item = NULL; DcmDbUtils *dcmDbUtils = DcmDbUtils::getInstance(); + int face_count = 0; DCM_CHECK_VAL(file_path, DCM_ERROR_INVALID_PARAMETER); @@ -490,7 +491,12 @@ int DcmScanSvc::ScanSingleItem(const char *file_path) (scan_single_curr_index)++; } - sendCompletedMsg( file_path/*ret*/, scan_item->face_count, DCM_IPC_PORT_DCM_RECV); + if (scan_item != NULL) + face_count = scan_item->face_count; + else + face_count = 0; + + sendCompletedMsg( file_path/*ret*/, face_count, DCM_IPC_PORT_DCM_RECV); clearSingleItemList(); -- 2.34.1