WolfSSL
/
wolfssh
mirror of https://github.com/wolfSSL/wolfssh.git
1
0
Fork 0
Code Issues Releases Wiki Activity

add free of buffer to GetStringAlloc

pull/258/head
Jacob Barthelmeh 2020-05-22 10:40:15 -06:00
parent 27f5be3db7
commit 9e4cb15135
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/internal.c
View File

@ -1661,7 +1661,8 @@ static int GetString(char* s, word32* sSz,
/* Gets the size of a string, allocates memory to hold it plus a NULL, then
* copies it into the allocated buffer, and terminates it with a NULL. */
* copies it into the allocated buffer, and terminates it with a NULL.
* If s points to an already created buffer, than it is free'd first */
static int GetStringAlloc(WOLFSSH* ssh, char** s,
byte* buf, word32 len, word32 *idx)
{
@ -1674,12 +1675,16 @@ static int GetStringAlloc(WOLFSSH* ssh, char** s,
if (result == WS_SUCCESS) {
if (*idx >= len || strSz > len - *idx)
return WS_BUFFER_E;
str = (char*)WMALLOC(strSz + 1, ssh->ctx->heap, DYNTYPE_STRING);
if (str == NULL)
return WS_MEMORY_E;
WMEMCPY(str, buf + *idx, strSz);
*idx += strSz;
str[strSz] = '\0';
if (*s != NULL)
WFREE(*s, ssh->ctx->heap, DYNTYPE_STRING);
*s = str;
}