commit fb80b4f72dd29d1dc61c434e86712eedb652f98f
author Tianjie Xu <xunchang@google.com> Wed Jan 18 22:24:16 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jan 18 22:24:16 2017 +0000
tree bc0b7413955600ea8e7e5feb72d1553be5c85d0f
parent ca45737e272aeefd657451a6faaa088d1903378c
parent 0a34b17c8b477bcf41d7ba5f1f34fe5308ef79e1

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

Change-Id: I4dbba92ea717951307dbcb6bf287edf4f6144a38

verifier.cpp

diff --git a/verifier.cpp b/verifier.cpp
index eeff95a..3d4f603 100644
--- a/verifier.cpp
+++ b/verifier.cpp
@@ -143,6 +143,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;