fix: possible bad null ref
This commit is contained in:
@@ -242,20 +242,20 @@ int JsonSaveTLVTree(json_t *root, json_t *elm, char *path, struct tlvdb *tlvdbel
|
|||||||
bool HexToBuffer(const char *errormsg, const char *hexvalue, uint8_t * buffer, size_t maxbufferlen, size_t *bufferlen) {
|
bool HexToBuffer(const char *errormsg, const char *hexvalue, uint8_t * buffer, size_t maxbufferlen, size_t *bufferlen) {
|
||||||
int buflen = 0;
|
int buflen = 0;
|
||||||
|
|
||||||
switch(param_gethex_to_eol(hexvalue, 0, buffer, maxbufferlen, &buflen)) {
|
switch (param_gethex_to_eol(hexvalue, 0, buffer, maxbufferlen, &buflen)) {
|
||||||
case 1:
|
case 1:
|
||||||
PrintAndLog("%s Invalid HEX value.", errormsg);
|
PrintAndLog("%s Invalid HEX value.", errormsg);
|
||||||
return false;
|
return false;
|
||||||
case 2:
|
case 2:
|
||||||
PrintAndLog("%s Hex value too large.", errormsg);
|
PrintAndLog("%s Hex value too large.", errormsg);
|
||||||
return false;
|
return false;
|
||||||
case 3:
|
case 3:
|
||||||
PrintAndLog("%s Hex value must have even number of digits.", errormsg);
|
PrintAndLog("%s Hex value must have even number of digits.", errormsg);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (buflen > maxbufferlen) {
|
if (buflen > maxbufferlen) {
|
||||||
PrintAndLog("%s HEX length (%d) more than %d", errormsg, *bufferlen, maxbufferlen);
|
PrintAndLog("%s HEX length (%d) more than %d", errormsg, (bufferlen) ? *bufferlen : -1, maxbufferlen);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user