Skip to content

refactored hexToBin function to reduct code paths and increase code c… #241

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aidankeefe2022 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

refactored hexToBin function to reduct code paths and increase code c… #241

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 25 additions & 55 deletions src/tools/clu_hex_to_bin.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,66 +63,36 @@ int wolfCLU_hexToBin(const char* h1, byte** b1, word32* b1Sz,
const char* h3, byte** b3, word32* b3Sz,
const char* h4, byte** b4, word32* b4Sz)
{
int ret;
int ret = 0;
const char* hex[4] = {h1,h2,h3,h4};
byte** bs[4] = {b1,b2,b3,b4};
word32* bSz[4] = {b1Sz,b2Sz,b3Sz,b4Sz};
int i = 0;

/* b1 */
if (h1 && b1 && b1Sz) {
*b1Sz = (int)XSTRLEN(h1) / 2;
*b1 = XMALLOC(*b1Sz, NULL, DYNAMIC_TYPE_TMP_BUFFER);
if (*b1 == NULL)
return MEMORY_E;
ret = Base16_Decode((const byte*)h1, (int)XSTRLEN(h1), *b1, b1Sz);
if (ret != 0) {
wolfCLU_freeBins(*b1, NULL, NULL, NULL, NULL);
return ret;
for (;i < 4; i++) {
if (hex[i] && bs[i] && bSz[i]) {
*bSz[i] = (int)XSTRLEN(hex[i]) / 2;
*bs[i] = XMALLOC(*bSz[i], NULL, DYNAMIC_TYPE_TMP_BUFFER);
if (*bs[i] == NULL) {
ret = MEMORY_E;
break;
}
ret = Base16_Decode((const byte*)hex[i], (int)XSTRLEN(hex[i]),
*bs[i], bSz[i]);
if (ret != 0) {
break;
}
}
}

/* b2 */
if (h2 && b2 && b2Sz) {
*b2Sz = (int)XSTRLEN(h2) / 2;
*b2 = XMALLOC(*b2Sz, NULL, DYNAMIC_TYPE_TMP_BUFFER);
if (*b2 == NULL) {
wolfCLU_freeBins(b1 ? *b1 : NULL, NULL, NULL, NULL, NULL);
return MEMORY_E;
}
ret = Base16_Decode((const byte*)h2, (int)XSTRLEN(h2), *b2, b2Sz);
if (ret != 0) {
wolfCLU_freeBins(b1 ? *b1 : NULL, *b2, NULL, NULL, NULL);
return ret;
}
}

/* b3 */
if (h3 && b3 && b3Sz) {
*b3Sz = (int)XSTRLEN(h3) / 2;
*b3 = XMALLOC(*b3Sz, NULL, DYNAMIC_TYPE_TMP_BUFFER);
if (*b3 == NULL) {
wolfCLU_freeBins(b1 ? *b1 : NULL, b2 ? *b2 : NULL, NULL, NULL, NULL);
return MEMORY_E;
}
ret = Base16_Decode((const byte*)h3, (int)XSTRLEN(h3), *b3, b3Sz);
if (ret != 0) {
wolfCLU_freeBins(b1 ? *b1 : NULL, b2 ? *b2 : NULL, *b3, NULL, NULL);
return ret;
}
}

/* b4 */
if (h4 && b4 && b4Sz) {
*b4Sz = (int)XSTRLEN(h4) / 2;
*b4 = XMALLOC(*b4Sz, NULL, DYNAMIC_TYPE_TMP_BUFFER);
if (*b4 == NULL) {
wolfCLU_freeBins(b1 ? *b1 : NULL,b2 ? *b2 : NULL,b3 ? *b3 :
NULL,NULL,NULL);
return MEMORY_E;
}
ret = Base16_Decode((const byte*)h4, (int)XSTRLEN(h4), *b4, b4Sz);
if (ret != 0) {
wolfCLU_freeBins(b1 ? *b1 : NULL, b2 ? *b2 : NULL, b3 ? *b3 : NULL,
*b4, NULL);
return ret;
if (ret != 0) {
/* free all allocations made before error */
for (; i >= 0; i--) {
if (hex[i] && bs[i] && bSz[i]) {
XFREE(*bs[i], NULL, DYNAMIC_TYPE_TMP_BUFFER);
}
}
return ret;
}

return WOLFCLU_SUCCESS;
Expand Down
Loading