generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

multi_split: check for NULL when allocating parts and bpart, and for failure of sk_BIO_push()

Browse Source 
Signed-off-by: Kurt Roeckx <kurt@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
This commit is contained in:
Jonas Maebe 2013-12-09 22:02:06 +01:00 committed by Kurt Roeckx
parent bd4acbc70e
commit 1c4b688cb4
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
crypto/asn1/asn_mime.c
View File

@ -636,21 +636,34 @@ static int multi_split(BIO *bio, char *bound, STACK_OF(BIO) **ret)
first = 1; first = 1;
parts = sk_BIO_new_null(); parts = sk_BIO_new_null();
*ret = parts; *ret = parts;
if (*ret == NULL)
return 0;
while ((len = BIO_gets(bio, linebuf, MAX_SMLEN)) > 0) { while ((len = BIO_gets(bio, linebuf, MAX_SMLEN)) > 0) {
state = mime_bound_check(linebuf, len, bound, blen); state = mime_bound_check(linebuf, len, bound, blen);
if(state == 1) { if(state == 1) {
first = 1; first = 1;
part++; part++;
} else if(state == 2) { } else if(state == 2) {
sk_BIO_push(parts, bpart); if (!sk_BIO_push(parts, bpart))
{
BIO_free(bpart);
return 0;
}
return 1; return 1;
} else if(part) { } else if(part) {
/* Strip CR+LF from linebuf */ /* Strip CR+LF from linebuf */
next_eol = strip_eol(linebuf, &len, 0); next_eol = strip_eol(linebuf, &len, 0);
if(first) { if(first) {
first = 0; first = 0;
if(bpart) sk_BIO_push(parts, bpart); if(bpart)
if (!sk_BIO_push(parts, bpart))
{
BIO_free(bpart);
return 0;
}
bpart = BIO_new(BIO_s_mem()); bpart = BIO_new(BIO_s_mem());
if (bpart == NULL)
return 0;
BIO_set_mem_eof_return(bpart, 0); BIO_set_mem_eof_return(bpart, 0);
} else if (eol) } else if (eol)
BIO_write(bpart, "\r\n", 2); BIO_write(bpart, "\r\n", 2);
@ -659,6 +672,8 @@ static int multi_split(BIO *bio, char *bound, STACK_OF(BIO) **ret)
BIO_write(bpart, linebuf, len); BIO_write(bpart, linebuf, len);
} }
} }
if (bpart != NULL)
BIO_free(bpart);
return 0; return 0;
} }