浏览代码

[HUST CSE]NULL POINTER (#7220)

* avoids the risk of a null pointer

* 将||改成&&来判断断言
There is a possibility of a null pointer

* there is a possibility of a null pointer

* Update components/drivers/fdt/src/dtb_get.c

Co-authored-by: Man, Jianting (Meco) <920369182@qq.com>

* 已根据代码规范进行修改,谢谢提醒

---------

Co-authored-by: Man, Jianting (Meco) <920369182@qq.com>
Hy 2 年之前
父节点
当前提交
7c629d974d

+ 1 - 1
bsp/Infineon/libraries/IFX_PSOC6_HAL/mtb-hal-cat1/source/cyhal_crc.c

@@ -52,7 +52,7 @@ cy_rslt_t cyhal_crc_init(cyhal_crc_t *obj)
 
 void cyhal_crc_free(cyhal_crc_t *obj)
 {
-    CY_ASSERT(NULL != obj&&obj->resource.type != CYHAL_RSC_CRYPTO);
+    CY_ASSERT(NULL != obj && obj->resource.type != CYHAL_RSC_CRYPTO);
     _cyhal_crc_calc_free(obj->base);
     if (obj->resource.type != CYHAL_RSC_INVALID)
     {

+ 1 - 0
components/drivers/fdt/src/dtb_get.c

@@ -724,6 +724,7 @@ struct dtb_memreserve *dtb_node_get_dtb_memreserve(struct dtb_node *dtb_node, in
             }
             dtb_node_root = dtb_node_root->parent;
         }
+        if(dtb_node_root == NULL) return NULL;
 
         *memreserve_size = dtb_node_root->header->memreserve_sz;