james/yubikey.rs
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

lib: handle realloc failures safely

Browse Source
This commit is contained in:
Dave Pate
2019-01-22 07:53:22 -08:00
committed by Klas Lindfors
parent f37cf3f462
commit afbe1b2670
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/util.c
+10 -2
View File
@@ -218,6 +218,7 @@ ykpiv_rc ykpiv_util_list_keys(ykpiv_state *state, uint8_t *key_count, ykpiv_key
ykpiv_rc res = YKPIV_OK; ykpiv_rc res = YKPIV_OK;
ykpiv_key *pKey = NULL; ykpiv_key *pKey = NULL;
uint8_t *pData = NULL; uint8_t *pData = NULL;
uint8_t *pTemp = NULL;
size_t cbData = 0; size_t cbData = 0;
size_t offset = 0; size_t offset = 0;
uint8_t buf[CB_BUF_MAX]; uint8_t buf[CB_BUF_MAX];
@@ -282,10 +283,13 @@ ykpiv_rc ykpiv_util_list_keys(ykpiv_state *state, uint8_t *key_count, ykpiv_key
cbRealloc = (sizeof(ykpiv_key) + cbBuf - 1) > (cbData - offset) ? MAX((sizeof(ykpiv_key) + cbBuf - 1) - (cbData - offset), CB_PAGE) : 0; cbRealloc = (sizeof(ykpiv_key) + cbBuf - 1) > (cbData - offset) ? MAX((sizeof(ykpiv_key) + cbBuf - 1) - (cbData - offset), CB_PAGE) : 0;
if (0 != cbRealloc) { if (0 != cbRealloc) {
if (NULL == (pData = _ykpiv_realloc(state, pData, cbData + cbRealloc))) { if (!(pTemp = _ykpiv_realloc(state, pData, cbData + cbRealloc))) {
/* realloc failed, pData will be freed in cleanup */
res = YKPIV_MEMORY_ERROR; res = YKPIV_MEMORY_ERROR;
goto Cleanup; goto Cleanup;
} }
pData = pTemp;
pTemp = NULL;
} }
cbData += cbRealloc; cbData += cbRealloc;
@@ -556,6 +560,7 @@ ykpiv_rc ykpiv_util_read_msroots(ykpiv_state *state, uint8_t **data, size_t *dat
int object_id = 0; int object_id = 0;
uint8_t tag = 0; uint8_t tag = 0;
uint8_t *pData = NULL; uint8_t *pData = NULL;
uint8_t *pTemp = NULL;
size_t cbData = 0; size_t cbData = 0;
size_t cbRealloc = 0; size_t cbRealloc = 0;
size_t offset = 0; size_t offset = 0;
@@ -606,10 +611,13 @@ ykpiv_rc ykpiv_util_read_msroots(ykpiv_state *state, uint8_t **data, size_t *dat
cbRealloc = len > (cbData - offset) ? len - (cbData - offset) : 0; cbRealloc = len > (cbData - offset) ? len - (cbData - offset) : 0;
if (0 != cbRealloc) { if (0 != cbRealloc) {
if (NULL == (pData = _ykpiv_realloc(state, pData, cbData + cbRealloc))) { if (!(pTemp = _ykpiv_realloc(state, pData, cbData + cbRealloc))) {
/* realloc failed, pData will be freed in cleanup */
res = YKPIV_MEMORY_ERROR; res = YKPIV_MEMORY_ERROR;
goto Cleanup; goto Cleanup;
} }
pData = pTemp;
pTemp = NULL;
} }
cbData += cbRealloc; cbData += cbRealloc;