commit d3d5e54a45eccac59eb72d5becfa9e320403b4f5
author Tianjie Xu <xunchang@google.com> Wed Jan 18 22:26:47 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jan 18 22:26:47 2017 +0000
tree 46baf45a74a9620f7b019239dc3fca7942d462b7
parent aa02888e55147ec78fa5636a87e2447bda136d68
parent fb80b4f72dd29d1dc61c434e86712eedb652f98f

Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b
am: fb80b4f72d

Change-Id: Iba2da78981e4bd7a2b263b2f6b18ab6c176e5fc8

verifier.cpp

diff --git a/verifier.cpp b/verifier.cpp
index 61e5adf..bf7071d 100644
--- a/verifier.cpp
+++ b/verifier.cpp
@@ -144,6 +144,12 @@
     LOGI("comment is %zu bytes; signature %zu bytes from end\n",
          comment_size, signature_start);
 
+    if (signature_start > comment_size) {
+        LOGE("signature start: %zu is larger than comment size: %zu\n", signature_start,
+             comment_size);
+        return VERIFY_FAILURE;
+    }
+
     if (signature_start <= FOOTER_SIZE) {
         LOGE("Signature start is in the footer");
         return VERIFY_FAILURE;