Merge pull request #6843 from gebart/pr/nullptr-iphc

6lo: Avoid null ptr dereference when SAC=0, DAC=1, DAM=00, M=1
6 years ago · 9f4e0669b7
parent 0fd85f982d 0ba9fd3456
commit 9f4e0669b7
1 changed files with 1 additions and 1 deletions
--- a/sys/net/gnrc/network_layer/sixlowpan/iphc/gnrc_sixlowpan_iphc.c
+++ b/sys/net/gnrc/network_layer/sixlowpan/iphc/gnrc_sixlowpan_iphc.c
@ -367,7 +367,7 @@ size_t gnrc_sixlowpan_iphc_decode(gnrc_pktsnip_t **dec_hdr, gnrc_pktsnip_t *pkt,
            dci = iphc_hdr[CID_EXT_IDX] & 0x0f;
        }

-        if (iphc_hdr[IPHC2_IDX] & SIXLOWPAN_IPHC2_DAM) {
+        if (iphc_hdr[IPHC2_IDX] & (SIXLOWPAN_IPHC2_M | SIXLOWPAN_IPHC2_DAM)) {
            ctx = gnrc_sixlowpan_ctx_lookup_id(dci);

            if (ctx == NULL) {