commit 002c9dfb8082b9971c987c9630b3de77f5ae4bf9
author Doug Zongker <dougz@android.com> Thu Dec 10 14:37:57 2009 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Dec 10 14:37:57 2009 -0800
tree 060ca5a70707c7559bd7cdd8785fd546e4d210b5
parent b8f506fb37ee9e20075cf544a8b5c167d3a2de22
parent 2278a04a0921007d726e9e1ec4b668860f961f88

am 2278a04a: am 9acf28a3: am c652e41d: fix cut-and-paste error in verifier

Merge commit '2278a04a0921007d726e9e1ec4b668860f961f88'

* commit '2278a04a0921007d726e9e1ec4b668860f961f88':
  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