Merge pull request #65 from yujincheng08/patch-1

Fix a UB when fdt_get_string return null
dgibson · Dec 28, 2021 · 9e6d9f3 · 9e6d9f3
2 parents c3be7b8 + 734024e
commit 9e6d9f3
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/libfdt/fdt_ro.c b/libfdt/fdt_ro.c
@@ -481,12 +481,12 @@ const void *fdt_getprop_by_offset(const void *fdt, int offset,
 		if (!can_assume(VALID_INPUT)) {
 			name = fdt_get_string(fdt, fdt32_ld_(&prop->nameoff),
 					      &namelen);
+			*namep = name;
 			if (!name) {
 				if (lenp)
 					*lenp = namelen;
 				return NULL;
 			}
-			*namep = name;
 		} else {
 			*namep = fdt_string(fdt, fdt32_ld_(&prop->nameoff));
 		}