misc/adsb-tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Hex parsing hardening.

Browse Source
This commit is contained in:
Ian Gulliver
2016-02-26 14:09:37 -08:00
parent e89d30af24
commit e3a372e1ea
11 changed files with 55 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
adsbus/raw.c
View File

@@ -34,8 +34,10 @@ static bool raw_parse_mode_s_short(struct buf *buf, struct packet *packet) {
(overlay->cr_lf != '\r' || overlay->lf != '\n'))) {
return false;
}
if (!hex_to_bin(packet->payload, overlay->payload, sizeof(overlay->payload) / 2)) {
return false;
}
packet->type = PACKET_TYPE_MODE_S_SHORT;
hex_to_bin(packet->payload, overlay->payload, sizeof(overlay->payload) / 2);
buf_consume(buf, overlay->cr_lf == '\r' ? sizeof(*overlay) : sizeof(*overlay) - 1);
return true;
}
@@ -49,8 +51,10 @@ static bool raw_parse_mode_s_long(struct buf *buf, struct packet *packet) {
(overlay->cr_lf != '\r' || overlay->lf != '\n'))) {
return false;
}
if (!hex_to_bin(packet->payload, overlay->payload, sizeof(overlay->payload) / 2)) {
return false;
}
packet->type = PACKET_TYPE_MODE_S_LONG;
hex_to_bin(packet->payload, overlay->payload, sizeof(overlay->payload) / 2);
buf_consume(buf, overlay->cr_lf == '\r' ? sizeof(*overlay) : sizeof(*overlay) - 1);
return true;
}