Merge pull request #658 from kaleb-himes/sniffer

Prevent forcezero from running on freed memory
This commit is contained in:
John Safranek
2016-12-09 09:04:01 -08:00
committed by GitHub

View File

@@ -1197,6 +1197,7 @@ static int LoadKeyFile(byte** keyBuf, word32* keyBufSz,
if (saveBufSz < 0) { if (saveBufSz < 0) {
saveBufSz = 0; saveBufSz = 0;
free(saveBuf); free(saveBuf);
saveBuf = NULL;
} }
else else
ret = 0; ret = 0;
@@ -1205,8 +1206,10 @@ static int LoadKeyFile(byte** keyBuf, word32* keyBufSz,
ForceZero(loadBuf, (word32)fileSz); ForceZero(loadBuf, (word32)fileSz);
free(loadBuf); free(loadBuf);
*keyBuf = saveBuf; if (saveBuf) {
*keyBufSz = (word32)saveBufSz; *keyBuf = saveBuf;
*keyBufSz = (word32)saveBufSz;
}
} }
else { else {
*keyBuf = loadBuf; *keyBuf = loadBuf;