修复码云里检测出的安全隐患

diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/DialBinParser.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/DialBinParser.h
index dc73723..78d3570 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/main/include/DialBinParser.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/DialBinParser.h
@@ -54,7 +54,7 @@ private:
 \r
     DialViewGroup* dialGroup_ = nullptr;\r
     std::string file_;\r
-    uint32_t dirId_ = 0xfef << 20; // 20: offset\r
+    uint32_t dirId_ = 0x00000fef << 20; // 20: offset\r
     uint32_t imageOffset_ = 0;\r
 };\r
 }\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/phoneservice/src/PhoneService.cpp b/code/sdk/application/wearable/fd230app/nativeui/phoneservice/src/PhoneService.cpp
index 5de08d3..61774e4 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/phoneservice/src/PhoneService.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/phoneservice/src/PhoneService.cpp
@@ -957,6 +957,7 @@ int GetCallLog(CallLogInfo **info, int *num)
     ret = fread(callInfo, sizeof(CallLogInfo), number, fp);
     if (ret != number) {
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[GetCallLog] fread fp fail ret = %d", ret);
+        free(callInfo);
         *info = NULL;
         *num = 0;
         fclose(fp);

diff --git a/code/sdk/application/wearable/fd230app/nativeui/set_dial/src/SetDialModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/set_dial/src/SetDialModel.cpp
index 122c0ad..bf1e77f 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/set_dial/src/SetDialModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/set_dial/src/SetDialModel.cpp
@@ -105,7 +105,7 @@ namespace OHOS {
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ParseDialHeader imageOffset: %u",
                       dialHeader.imageOffset);
         ImageInfo *info = ImageCacheManager::GetInstance().LoadOneInMultiRes(
-            dialHeader.previewImgId | (0xfef << 20), dialFullName, fp, false, dialHeader.imageOffset);
+            dialHeader.previewImgId | (0x00000fef << 20), dialFullName, fp, false, dialHeader.imageOffset);
         if (info == nullptr) {
             WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ParseDialHeader loadimage fail");
             return -1;

diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/src/Systemupgrade.cpp b/code/sdk/application/wearable/fd230app/nativeui/system/src/Systemupgrade.cpp
index 8145ef3..3eb158b 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/system/src/Systemupgrade.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/system/src/Systemupgrade.cpp
@@ -104,7 +104,7 @@ namespace OHOS
         if(fp==NULL)
         {
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "open_UPDATAREPORT_fail");
-            fclose(fp);
+            // fclose(fp);
             return;
         }
 

diff --git a/code/sdk/application/wearable/service/factorytest_service/factorytest_protocol.c b/code/sdk/application/wearable/service/factorytest_service/factorytest_protocol.c
index 346ac7f..ff897fe 100644 (file)
--- a/code/sdk/application/wearable/service/factorytest_service/factorytest_protocol.c
+++ b/code/sdk/application/wearable/service/factorytest_service/factorytest_protocol.c
@@ -319,7 +319,7 @@ void aging_task(void)
         aging_t.restart_num = 0;\r
         PRINT("aging_t.restart_num : %d \r\n",aging_t.restart_num);\r
 \r
-        uint16_t before_block_num;\r
+        uint16_t before_block_num=0;\r
         struct nand_driver_struct *nandflash_driver;\r
         nandflash_driver = get_nand_flash();\r
         for (uint32_t i = 0; i < nandflash_driver->total_block; i++) \r
@@ -396,7 +396,7 @@ void aging_task(void)
         }\r
         PRINT("aging_t.flash_res_error : %d \r\n",aging_t.flash_res_error);\r
 \r
-        uint16_t after_block_num;\r
+        uint16_t after_block_num=0;\r
         nandflash_driver = get_nand_flash();\r
         for (uint32_t i = 0; i < nandflash_driver->total_block; i++) \r
         {\r

diff --git a/code/sdk/application/wearable/service/msg_center/src/msg_center_cmd.cpp b/code/sdk/application/wearable/service/msg_center/src/msg_center_cmd.cpp
index 6300431..7f0c5dc 100755 (executable)
--- a/code/sdk/application/wearable/service/msg_center/src/msg_center_cmd.cpp
+++ b/code/sdk/application/wearable/service/msg_center/src/msg_center_cmd.cpp
@@ -74,6 +74,7 @@ char *msg_center_get_bundle_name(uint8_t cmd_id)
             WEARABLE_LOGI(WEARABLE_LOG_MODULE_MSG_CENTER,"msg_center_get_bundle_name: wrong cmd_id[%d]", cmd_id);
             break;
     }
+    return NULL;
 }
 
 static errcode_t msg_center_pkt_dispatch(uint8_t cmd_id, uint8_t type, void *usr_data, uint16_t usr_len)

diff --git a/code/sdk/drivers/peripheral/utils/custom_utils.c b/code/sdk/drivers/peripheral/utils/custom_utils.c
index ef526a9..b36dd01 100644 (file)
--- a/code/sdk/drivers/peripheral/utils/custom_utils.c
+++ b/code/sdk/drivers/peripheral/utils/custom_utils.c
@@ -1422,7 +1422,7 @@ int set_bmp(void)
     /* 打开BMP 文件 */
     FILE *fp = fopen(path, "r");
     if (fp == NULL) {
-        fclose(fp);
+        // fclose(fp);
         PRINT("file open failed !!!\r\n");
         return -1;
     }