diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-11-25 13:19:21 +0100 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-11-25 13:19:21 +0100 |
| commit | 576b0c26baf9b5b1418650a572604325ca7fb3af (patch) | |
| tree | 8b2986d66ed4e6bdf5a3253c81f32cc5a8e53b99 /app/openssl/crypto/evp/encode.c | |
| parent | bbf877a099112acbf34589b01503c3f5ee135dc0 (diff) | |
| parent | 48cd0f2fa3094b5a6b7b07d6413d77bdbc9bbc20 (diff) | |
Merge branch 'develop'0.8.0
Diffstat (limited to 'app/openssl/crypto/evp/encode.c')
| -rw-r--r-- | app/openssl/crypto/evp/encode.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/openssl/crypto/evp/encode.c b/app/openssl/crypto/evp/encode.c index 28546a84..4654bdc6 100644 --- a/app/openssl/crypto/evp/encode.c +++ b/app/openssl/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 |