ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Cellular: Refactor hex reading to prevent illegal cast

pull/6765/head
Mirela Chirica 2018-04-30 13:25:15 +03:00
parent a0cc22ebba
commit d4d339129a
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
features/cellular/framework/AT/ATHandler.cpp
View File

@ -472,25 +472,23 @@ ssize_t ATHandler::read(char *buf, size_t size, bool read_even_stop_tag, bool he
}
size_t match_pos = 0;
size_t upper = 0, lower = 0;
size_t read_size = hex ? size*2 : size;
uint8_t *pbuf = (uint8_t*)buf;
consume_char('\"');
size_t read_idx = 0;
size_t buf_idx = 0;
char hexbuf[2];
for (; read_idx < (read_size + match_pos); read_idx++) {
int c = get_char();
buf_idx = hex ? read_idx/2 : read_idx;
if (c == -1) {
pbuf[buf_idx] = '\0';
buf[buf_idx] = '\0';
set_error(NSAPI_ERROR_DEVICE_ERROR);
return -1;
} else if (c == _delimiter) {
pbuf[buf_idx] = '\0';
buf[buf_idx] = '\0';
break;
} else if (c == '\"') {
match_pos = 0;
@ -504,7 +502,7 @@ ssize_t ATHandler::read(char *buf, size_t size, bool read_even_stop_tag, bool he
_stop_tag->found = true;
// remove tag from string if it was matched
buf_idx -= (_stop_tag->len - 1);
pbuf[buf_idx] = '\0';
buf[buf_idx] = '\0';
break;
}
} else if (match_pos) {
@ -512,13 +510,11 @@ ssize_t ATHandler::read(char *buf, size_t size, bool read_even_stop_tag, bool he
}
if (!hex) {
pbuf[buf_idx] = c;
buf[buf_idx] = c;
} else {
if (read_idx % 2 == 0) {
upper = hex_str_to_int((const char*)&c, 1);
} else {
lower = hex_str_to_int((const char*)&c, 1);
pbuf[buf_idx] = ((upper<<4) & 0xF0) | (lower & 0x0F);
hexbuf[read_idx % 2] = c;
if (read_idx % 2 == 1) {
hex_str_to_char_str(hexbuf, 2, buf+buf_idx);
}
}
}