aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre-Clément Tosi <ptosi@google.com>2022-09-26 12:18:50 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-09-26 12:18:50 +0000
commit0a053dfe49d6304f50a5c9656b2102e6be820b81 (patch)
treef29df083681388501085cc17375322d8888d1bf6
parent2d6c51c1d2508f20641d451825230d13f7384539 (diff)
parent98ab028002c083a84acfff83c7cf8b806b737d1c (diff)
downloaddtc-0a053dfe49d6304f50a5c9656b2102e6be820b81.tar.gz
libfdt: fdt_path_offset_namelen: Reject empty paths am: d10c84c4bc am: 9f4834b735 am: e0440b0907 am: 13d00fad64 am: 7799b9fb26 am: 98ab028002
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/dtc/+/20024811 Change-Id: If1b8fc5dcd1dffa39e103686b057972680882927 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--libfdt/fdt_ro.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libfdt/fdt_ro.c b/libfdt/fdt_ro.c
index 7a65dfe..67fb218 100644
--- a/libfdt/fdt_ro.c
+++ b/libfdt/fdt_ro.c
@@ -256,6 +256,9 @@ int fdt_path_offset_namelen(const void *fdt, const char *path, int namelen)
if (namelen < 1)
return -FDT_ERR_BADPATH;
+ if (namelen < 1)
+ return -FDT_ERR_BADPATH;
+
/* see if we have an alias */
if (*path != '/') {
const char *q = memchr(path, '/', end - p);