mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-03-01 19:28:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Deal with BUF_MEM_grow ambiguity

Browse Source 
BUF_MEM_grow() returns the passed length, but also zero on error.  If
the passed length was zero, an extra check to see if a returned zero
was an error or not is needed.

Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/9662)
This commit is contained in:
Richard Levitte 2019-08-30 16:54:47 +02:00 committed by Pauli
parent ea643c959f
commit 53598b2298
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
crypto/evp/pkey_kdf.c
View File

@ -83,9 +83,16 @@ static int collect(BUF_MEM **collector, void *data, size_t datalen)
}
i = (*collector)->length; /* BUF_MEM_grow() changes it! */
if (!BUF_MEM_grow(*collector, i + datalen))
/*
* The i + datalen check is to distinguish between BUF_MEM_grow()
* signaling an error and BUF_MEM_grow() simply returning the (zero)
* length.
*/
if (!BUF_MEM_grow(*collector, i + datalen)
&& i + datalen != 0)
return 0;
memcpy((*collector)->data + i, data, datalen);
if (data != NULL)
memcpy((*collector)->data + i, data, datalen);
return 1;
}