github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-24 15:15:39 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: no error message when para was zero

Browse source
This commit is contained in:
iceman1001 2020-04-12 21:23:52 +02:00
commit 4cc6d3858d
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
client/cliparser/cliparser.c
View file

@ -157,11 +157,14 @@ int CLIParamHexToBuf(struct arg_str *argstr, uint8_t *data, int maxdatalen, int
int ibuf = 0; int ibuf = 0;
uint8_t tmp_buf[256] = {0}; uint8_t tmp_buf[256] = {0};
int res = CLIParamStrToBuf(argstr, tmp_buf, maxdatalen * 2, &ibuf); // *2 because here HEX int res = CLIParamStrToBuf(argstr, tmp_buf, maxdatalen * 2, &ibuf); // *2 because here HEX
if (res || !ibuf){ if (res) {
printf("Parameter error: buffer overflow.\n"); printf("Parameter error: buffer overflow.\n");
fflush(stdout); fflush(stdout);
return res; return res;
} }
if (ibuf == 0) {
return res;
}
switch (param_gethex_to_eol((char *)tmp_buf, 0, data, maxdatalen, datalen)) { switch (param_gethex_to_eol((char *)tmp_buf, 0, data, maxdatalen, datalen)) {
case 1: case 1:
@ -199,12 +202,13 @@ int CLIParamStrToBuf(struct arg_str *argstr, uint8_t *data, int maxdatalen, int
if (!ibuf) if (!ibuf)
return 0; return 0;
if (ibuf > maxdatalen) if (ibuf > maxdatalen) {
fflush(stdout);
return 2; return 2;
}
memcpy(data, tmp_buf, ibuf); memcpy(data, tmp_buf, ibuf);
*datalen = ibuf; *datalen = ibuf;
return 0; return 0;
} }