commit 540f1a8abfc1b5a3f1520caca0d17f74c08b8327
author Xin Li <delphij@google.com> Wed Jun 12 14:36:10 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Jun 12 14:36:10 2019 -0700
tree 74afd0da76dd9dfdef9c795c25122dd2a95c2601
parent 6deebcac8d21516b126edc4249bd0cf84e729c28
parent 46dbbd915eac91f337bed040ace3ab53c0bf8e7d

Merge "Sync with upstream up to 0d367b12:" am: fa304d06a2 am: 686b91faf3
am: 46dbbd915e

Change-Id: Ibdf3220bf31aa5d9f667bf9e34680b38bd1ba000

dir.c

diff --git a/dir.c b/dir.c
index e59536f..e56bbf8 100644
--- a/dir.c
+++ b/dir.c
@@ -629,6 +629,15 @@
 					vallfn = NULL;
 				}
 				lidx = *p & LRNOMASK;
+				if (lidx == 0) {
+					pwarn("invalid long name\n");
+					if (!invlfn) {
+						invlfn = vallfn;
+						invcl = valcl;
+					}
+					vallfn = NULL;
+					continue;
+				}
 				t = longName + --lidx * 13;
 				for (k = 1; k < 11 && t < longName +
 				    sizeof(longName); k += 2) {