commit 614907365128497c74c1f61d7576bff12e108f70
author Doug Zongker <dougz@android.com> Tue Dec 08 15:54:32 2009 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Dec 08 15:54:32 2009 -0800
tree a577cbc50181a1d895a4560fe919b72a5b092a54
parent 052acd61c8748b728d632464f52a47a0841f6bac
parent c652e41d9173e299a8e1805ae1b2bba75a34ae12

am c652e41d: fix cut-and-paste error in verifier

Merge commit 'c652e41d9173e299a8e1805ae1b2bba75a34ae12' into eclair-plus-aosp

* commit 'c652e41d9173e299a8e1805ae1b2bba75a34ae12':
  fix cut-and-paste error in verifier

verifier.c

diff --git a/verifier.c b/verifier.c
index f2491a1..164fb4a 100644
--- a/verifier.c
+++ b/verifier.c
@@ -123,7 +123,7 @@
     int i;
     for (i = 4; i < eocd_size-3; ++i) {
         if (eocd[i  ] == 0x50 && eocd[i+1] == 0x4b &&
-            eocd[i+2] == 0x05 && eocd[i+1] == 0x06) {
+            eocd[i+2] == 0x05 && eocd[i+3] == 0x06) {
             // if the sequence $50 $4b $05 $06 appears anywhere after
             // the real one, minzip will find the later (wrong) one,
             // which could be exploitable.  Fail verification if