[PATCH uci v2 3/4] ucimap: Check return of malloc()

Hauke Mehrtens hauke at hauke-m.de
Sun Oct 4 11:14:50 EDT 2020


Check the return value of malloc() before accessing it.

Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
---
 ucimap.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ucimap.c b/ucimap.c
index 7c2b043..c46cf45 100644
--- a/ucimap.c
+++ b/ucimap.c
@@ -893,14 +893,16 @@ ucimap_parse(struct uci_map *map, struct uci_package *pkg)
 
 			if (sm->alloc) {
 				sd = sm->alloc(map, sm, s);
+				if (!sd)
+					continue;
 				memset(sd, 0, sizeof(struct ucimap_section_data));
 			} else {
 				sd = malloc(sm->alloc_len);
+				if (!sd)
+					continue;
 				memset(sd, 0, sm->alloc_len);
 				sd = ucimap_ptr_section(sm, sd);
 			}
-			if (!sd)
-				continue;
 
 			ucimap_parse_section(map, sm, sd, s);
 		}
-- 
2.20.1




More information about the openwrt-devel mailing list