TeaSpeak/tomcrypt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Prevent undefined behavior

Browse Source 
Don't call XMEMCPY() in case info (the source parameter to memcpy) is NULL
as this would trigger UB
This commit is contained in:
Steffen Jaeckel 2015-09-16 23:51:57 +02:00
parent 318dbbccc3
commit f5016d88dd
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/misc/hkdf/hkdf.c
View File

@ -61,7 +61,9 @@ int hkdf_expand(int hash_idx, const unsigned char *info, unsigned long infolen,
if (T == NULL) { if (T == NULL) {
return CRYPT_MEM; return CRYPT_MEM;
} }
XMEMCPY(T + hashsize, info, infolen); if (info != NULL) {
XMEMCPY(T + hashsize, info, infolen);
}
/* HMAC data T(1) doesn't include a previous hash value */ /* HMAC data T(1) doesn't include a previous hash value */
dat = T + hashsize; dat = T + hashsize;