diff options
author | Raphaƫl Moll <ralf@android.com> | 2012-05-30 14:46:34 -0700 |
---|---|---|
committer | android code review <noreply-gerritcodereview@google.com> | 2012-05-30 14:46:35 -0700 |
commit | 54a2a6df410ad860f048ef4ff653820787f68f3a (patch) | |
tree | 8e109b3f3a900ba8b76e574e05eb4c87e3bd15a3 | |
parent | 84bda3e3c64611941c4d10b3d22e11bd623ff640 (diff) | |
parent | 98a0607a314a7a6023fabdafaa8e470a1e800c09 (diff) | |
download | base-54a2a6df410ad860f048ef4ff653820787f68f3a.tar.gz |
Merge "Merge "Fix length of pattern." DO NOT MERGE."
-rw-r--r-- | tools/aapt/AaptAssets.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/aapt/AaptAssets.cpp b/tools/aapt/AaptAssets.cpp index eba77c258acb..7d735ad424e6 100644 --- 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; } |