commit 642f1498d056dbba3e50ed5a232ab2f482626dec
author David Benjamin <davidben@chromium.org> Thu Mar 19 17:42:08 2015 -0400
committer Adam Langley <agl@google.com> Thu Mar 19 21:59:28 2015 +0000
tree 80153749d39bf4d749180796c0346253e777a3da
parent 7061e28dc203a6451e7a9bb2dce39f2751bcf7b3

evp: prevent underflow in base64 decoding

This patch resolves RT ticket #2608.

(Imported from upstream's d0666f289ac013094bbbf547bfbcd616199b7d2d.)

Change-Id: If0c8f583f3f643f3db6b6158cbc9ad7541bab8ec
Reviewed-on: https://boringssl-review.googlesource.com/4060
Reviewed-by: Adam Langley <agl@google.com>

crypto/base64/base64.c

diff --git a/crypto/base64/base64.c b/crypto/base64/base64.c
index 12a52cf..4822fb8 100644
--- a/crypto/base64/base64.c
+++ b/crypto/base64/base64.c
@@ -373,6 +373,10 @@
           rv = 0;
           goto end;
         }
+        if (eof > v) {
+          rv = -1;
+          goto end;
+        }
         ret += (v - eof);
       } else {
         eof = 1;