Merge "Fix length of pattern." DO NOT MERGE.

After skipping * with "token++", the length should decrease by 1 as
well.

(merged from 996b073e813ba1a22a13282ccdebb664f14ba898)

Change-Id: Ie6232ef603bb31e25e03b926e6c1bb92ac34902d

diff --git a/AaptAssets.cpp b/AaptAssets.cpp
index eba77c258acbf41367bb77dc8cadd674f3308027..7d735ad424e6b38889d05b62946c80fe718c6dd9 100644 (file)
--- a/AaptAssets.cpp
+++ b/AaptAssets.cpp
@@ -122,6 +122,7 @@ static bool isHidden(const char *root, const char *path)
         if (token[0] == '*') {
             // Match *suffix
             token++;
         if (token[0] == '*') {
             // Match *suffix
             token++;

+            n--;

             if (n <= plen) {
                 ignore = strncasecmp(token, path + plen - n, n) == 0;
             }
             if (n <= plen) {
                 ignore = strncasecmp(token, path + plen - n, n) == 0;
             }