feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Merge pull request #5915 from julek-wolfssl/dtls-remove-realloc-dep

Browse Source 
DtlsMsgCombineFragBuckets: Remove realloc dependency
This commit is contained in:
David Garske
2022-12-22 17:01:31 -08:00
committed by GitHub
parent 62e3835b0e 2fe6555fcf
commit 135b9f0566
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/internal.c
View File

@ -8310,10 +8310,19 @@ static DtlsFragBucket* DtlsMsgCombineFragBuckets(DtlsMsg* msg,
} }
{ {
#ifdef XREALLOC
DtlsFragBucket* tmp = (DtlsFragBucket*)XREALLOC(*chosenBucket, DtlsFragBucket* tmp = (DtlsFragBucket*)XREALLOC(*chosenBucket,
sizeof(DtlsFragBucket) + newSz, heap, DYNAMIC_TYPE_DTLS_FRAG); sizeof(DtlsFragBucket) + newSz, heap, DYNAMIC_TYPE_DTLS_FRAG);
#else
DtlsFragBucket* tmp = (DtlsFragBucket*)XMALLOC(
sizeof(DtlsFragBucket) + newSz, heap, DYNAMIC_TYPE_DTLS_FRAG);
#endif
if (tmp == NULL) if (tmp == NULL)
return NULL; return NULL;
#ifndef XREALLOC
XMEMCPY(tmp, *chosenBucket, sizeof(DtlsFragBucket) +
(*chosenBucket)->m.m.sz);
#endif
if (chosenBucket == &next) { if (chosenBucket == &next) {
/* Update the link */ /* Update the link */
DtlsFragBucket* beforeNext = cur; DtlsFragBucket* beforeNext = cur;
@ -8321,6 +8330,9 @@ static DtlsFragBucket* DtlsMsgCombineFragBuckets(DtlsMsg* msg,
beforeNext = beforeNext->m.m.next; beforeNext = beforeNext->m.m.next;
beforeNext->m.m.next = tmp; beforeNext->m.m.next = tmp;
} }
#ifndef XREALLOC
XFREE(*chosenBucket, heap, DYNAMIC_TYPE_DTLS_FRAG);
#endif
newBucket = *chosenBucket = tmp; newBucket = *chosenBucket = tmp;
} }