diff options
| author | Geoff Thorpe <geoff@openssl.org> | 2014-05-04 18:44:14 -0400 |
|---|---|---|
| committer | Geoff Thorpe <geoff@openssl.org> | 2014-05-06 18:23:54 -0400 |
| commit | 9febee02720902c195fe929ecfe06362c551422c (patch) | |
| tree | b4206de1fec216c66096def5672aa32fb589f6a5 /crypto | |
| parent | a721216f0f6f7ca16b5fa3630ee06d577542ab15 (diff) | |
evp: prevent underflow in base64 decoding
This patch resolves RT ticket #2608.
Thanks to Robert Dugal for originally spotting this, and to David
Ramos for noticing that the ball had been dropped.
Signed-off-by: Geoff Thorpe <geoff@openssl.org>
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/evp/encode.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/crypto/evp/encode.c b/crypto/evp/encode.c index e8a521814a..69f7ccad69 100644 --- a/crypto/evp/encode.c +++ b/crypto/evp/encode.c @@ -324,6 +324,7 @@ int EVP_DecodeUpdate(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl, v=EVP_DecodeBlock(out,d,n); n=0; if (v < 0) { rv=0; goto end; } + if (eof > v) { rv=-1; goto end; } ret+=(v-eof); } else |