Skip to content

Commit 5e91715

Browse files
authored
Merge pull request #306 from sameehj/free
Fix missing wc_AesFree on wc_AesGcmSetKey failure in Unwrap functions
2 parents 0507f33 + a260f9b commit 5e91715

2 files changed

Lines changed: 3 additions & 1 deletion

File tree

port/posix/posix_transport_tcp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,12 +120,12 @@ static int posixTransportTcp_Send(int fd, uint16_t* buffer_offset,
120120
return WH_ERROR_BADARGS;
121121
}
122122

123+
send_size = sizeof(uint32_t) + size;
123124
if(*buffer_offset == 0) {
124125
/* Initial write. Copy data to buffer */
125126
/* Prepend packet data with the size in network order */
126127
*packet_len = htonl((uint32_t)size);
127128
memcpy(packet_data, data, size);
128-
send_size = sizeof(uint32_t) + size;
129129
}
130130
int remaining_size = send_size - *buffer_offset;
131131

src/wh_server_keystore.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1037,6 +1037,7 @@ static int _AesGcmKeyUnwrap(whServerContext* server, uint16_t serverKeyId,
10371037

10381038
ret = wc_AesGcmSetKey(aes, serverKey, serverKeySz);
10391039
if (ret != 0) {
1040+
wc_AesFree(aes);
10401041
return ret;
10411042
}
10421043

@@ -1171,6 +1172,7 @@ static int _AesGcmDataUnwrap(whServerContext* server, uint16_t serverKeyId,
11711172

11721173
ret = wc_AesGcmSetKey(aes, serverKey, serverKeySz);
11731174
if (ret != 0) {
1175+
wc_AesFree(aes);
11741176
return ret;
11751177
}
11761178

0 commit comments

Comments
 (0)