summaryrefslogtreecommitdiffstats
path: root/tools/aapt
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2012-05-22 11:43:14 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-05-22 11:43:14 -0700
commitac9f50573dad2050d261850f1accbcea383cc6f0 (patch)
tree20b3b890015bf87346a6c5ebfa019d3f734b77e0 /tools/aapt
parent88ab8c8de4d8d2e2c1f3237024ecdefd77300916 (diff)
parent996b073e813ba1a22a13282ccdebb664f14ba898 (diff)
downloadframeworks_base-ac9f50573dad2050d261850f1accbcea383cc6f0.zip
frameworks_base-ac9f50573dad2050d261850f1accbcea383cc6f0.tar.gz
frameworks_base-ac9f50573dad2050d261850f1accbcea383cc6f0.tar.bz2
am 996b073e: Fix length of pattern.
* commit '996b073e813ba1a22a13282ccdebb664f14ba898': Fix length of pattern.
Diffstat (limited to 'tools/aapt')
-rw-r--r--tools/aapt/AaptAssets.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/aapt/AaptAssets.cpp b/tools/aapt/AaptAssets.cpp
index 73705ae..f2fa3f5 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;
}