diff options
| author | Håkon Nessjøen <haakon.nessjoen@gmail.com> | 2011-02-27 14:27:29 +0100 |
|---|---|---|
| committer | Håkon Nessjøen <haakon.nessjoen@gmail.com> | 2011-02-27 14:27:29 +0100 |
| commit | 5b786ccb2a21937fcc6e1a29167db47f1d78abb5 (patch) | |
| tree | 1b9c941769978a94b5476da1240674f1c3a382db /protocol.c | |
| parent | e149992b6487bb41308a1893500e35bbe6d195c0 (diff) | |
| download | MAC-Telnet-5b786ccb2a21937fcc6e1a29167db47f1d78abb5.tar.gz MAC-Telnet-5b786ccb2a21937fcc6e1a29167db47f1d78abb5.zip | |
Code cleanup.
Diffstat (limited to 'protocol.c')
| -rw-r--r-- | protocol.c | 11 |
1 files changed, 9 insertions, 2 deletions
@@ -195,8 +195,9 @@ int parse_control_packet(unsigned char *packetdata, int data_len, struct mt_mact and then several times for each control packets. Letting this function control the data position. */ if (packetdata != NULL) { - if (data_len <= 0) + if (data_len <= 0) { return 0; + } int_data = packetdata; int_data_len = data_len; @@ -204,8 +205,9 @@ int parse_control_packet(unsigned char *packetdata, int data_len, struct mt_mact } /* No more data to parse? */ - if (int_pos >= int_data_len) + if (int_pos >= int_data_len) { return 0; + } /* Set current position in data buffer */ data = int_data + int_pos; @@ -309,6 +311,11 @@ struct mt_mndp_info *parse_mndp(const unsigned char *data, const int packet_len) p += 4; + /* Check if len is invalid */ + if (p + len > data + packet_len) { + break; + } + switch (type) { case MT_MNDPTYPE_ADDRESS: if (len >= ETH_ALEN) { |