diff options
| author | 2023-10-06 13:35:44 +0100 | |
|---|---|---|
| committer | 2023-10-06 13:39:51 +0100 | |
| commit | 824645385979cf00626c048fcc5443e7209af458 (patch) | |
| tree | ac0518946e103ed2ba43c5e64f7108798a3121fe | |
| parent | d7e38d805f6166b135015809518d5fa12d655265 (diff) | |
ANDROID: De-dup fdt_path_offset_namelen check
Due to a missing "Merged-In" tag, automerger got confused and AOSP ended
up with "libfdt: fdt_path_offset_namelen: Reject empty paths" being
applied twice:
commit d10c84c4bc78e8ebd8c6ebf70126ad3cb0ba1c46
commit a6ac6d916df145366bcb34f5507d5da213b2ebaf
so remove the duplicated code.
Test: N/A
Change-Id: I3684b3d6af1be02a96ffa04f98c15297f890cc74
| -rw-r--r-- | libfdt/fdt_ro.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libfdt/fdt_ro.c b/libfdt/fdt_ro.c index a62ec78..362cc4a 100644 --- a/libfdt/fdt_ro.c +++ b/libfdt/fdt_ro.c @@ -266,9 +266,6 @@ 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); |