diff options
| author | Hy <[email protected]> | 2023-04-17 08:12:27 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-04-17 08:12:27 +0800 |
| commit | 7c629d974db55fd444ddd6ae70c9c604ce68ab76 (patch) | |
| tree | 1171eb829bcc93d889658509697d0695efa5f84f | |
| parent | 60835af8e1ea72f5c425849e413dc6f0d2f9f843 (diff) | |
[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) <[email protected]>
* 已根据代码规范进行修改，谢谢提醒
---------
Co-authored-by: Man, Jianting (Meco) <[email protected]>
| -rw-r--r-- | bsp/Infineon/libraries/IFX_PSOC6_HAL/mtb-hal-cat1/source/cyhal_crc.c | 2 | ||||
| -rw-r--r-- | components/drivers/fdt/src/dtb_get.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/bsp/Infineon/libraries/IFX_PSOC6_HAL/mtb-hal-cat1/source/cyhal_crc.c b/bsp/Infineon/libraries/IFX_PSOC6_HAL/mtb-hal-cat1/source/cyhal_crc.c index e50ffc65a4..acc96a942a 100644 --- a/bsp/Infineon/libraries/IFX_PSOC6_HAL/mtb-hal-cat1/source/cyhal_crc.c +++ b/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) { diff --git a/components/drivers/fdt/src/dtb_get.c b/components/drivers/fdt/src/dtb_get.c index df1b5f9341..4922b98d6c 100644 --- a/components/drivers/fdt/src/dtb_get.c +++ b/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; |