From: Ying Wang <wangying@google.com>
Date: Tue, 22 May 2012 18:24:22 +0000 (-0700)
Subject: Merge "Fix length of pattern." DO NOT MERGE.
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/8be9f9e93371403dc056f1b13f8b93ff3863eaad?ds=sidebyside

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 eba77c2..7d735ad 100644
--- 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++;
+            n--;
             if (n <= plen) {
                 ignore = strncasecmp(token, path + plen - n, n) == 0;
             }