DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev

Change-Id: Ie52a9abae416bbb84ddc61bb7159a531de778c15
diff --git a/verifier.cpp b/verifier.cpp
index 0930fbd..c0b2bde 100644
--- a/verifier.cpp
+++ b/verifier.cpp
@@ -155,6 +155,13 @@
     LOGI("comment is %d bytes; signature %d 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);
+        fclose(f);
+        return VERIFY_FAILURE;
+    }
+
     if (signature_start <= FOOTER_SIZE) {
         LOGE("Signature start is in the footer");
         fclose(f);