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

2012-05-30 14:46:34 -07:00
parent 84bda3e3c6 98a0607a31
commit 54a2a6df41
1 changed files with 1 additions and 0 deletions
--- a/tools/aapt/AaptAssets.cpp
+++ b/tools/aapt/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;
            }