diff options
| author | Mark Dykes <mardyk01@review.trustedfirmware.org> | 2020-02-10 17:20:53 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2020-02-10 17:20:53 +0000 |
| commit | 513b6165ee16f5106b5048b6852939dcdc6d8ae2 (patch) | |
| tree | b493bf88f0abd19fca48be121b62710b57dda747 /common | |
| parent | c8e0f950c1fcb3e76a6d5ec80c3bb8f99fcd941f (diff) | |
| parent | 466bb285c6985027c75a230e39f2ae246fd07971 (diff) | |
| download | platform_external_arm-trusted-firmware-513b6165ee16f5106b5048b6852939dcdc6d8ae2.tar.gz platform_external_arm-trusted-firmware-513b6165ee16f5106b5048b6852939dcdc6d8ae2.tar.bz2 platform_external_arm-trusted-firmware-513b6165ee16f5106b5048b6852939dcdc6d8ae2.zip | |
Merge "coverity: Fix MISRA null pointer violations" into integration
Diffstat (limited to 'common')
| -rw-r--r-- | common/desc_image_load.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/common/desc_image_load.c b/common/desc_image_load.c index f2e8f6054..b4835978b 100644 --- a/common/desc_image_load.c +++ b/common/desc_image_load.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2019, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2016-2020, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -301,9 +301,9 @@ void bl31_params_parse_helper(u_register_t param, image_info_t *bl33_image_info; } *v1 = (void *)(uintptr_t)param; assert(v1->h.type == PARAM_BL31); - if (bl32_ep_info_out) + if (bl32_ep_info_out != NULL) *bl32_ep_info_out = *v1->bl32_ep_info; - if (bl33_ep_info_out) + if (bl33_ep_info_out != NULL) *bl33_ep_info_out = *v1->bl33_ep_info; return; } @@ -311,12 +311,12 @@ void bl31_params_parse_helper(u_register_t param, assert(v2->h.version == PARAM_VERSION_2); assert(v2->h.type == PARAM_BL_PARAMS); - for (node = v2->head; node; node = node->next_params_info) { + for (node = v2->head; node != NULL; node = node->next_params_info) { if (node->image_id == BL32_IMAGE_ID) - if (bl32_ep_info_out) + if (bl32_ep_info_out != NULL) *bl32_ep_info_out = *node->ep_info; if (node->image_id == BL33_IMAGE_ID) - if (bl33_ep_info_out) + if (bl33_ep_info_out != NULL) *bl33_ep_info_out = *node->ep_info; } } |