Bug 1464069 - Check for null message in nr_stun_decode_message; r?drno draft
authorDan Minor <dminor@mozilla.com>
Fri, 25 May 2018 11:57:18 -0400
changeset 799928 d5c59393a3b41926f701893671922676c60a839c
parent 798068 f85be0c4f0562ea59a91000883e0e7848491837c
push id111209
push userbmo:dminor@mozilla.com
push dateFri, 25 May 2018 16:02:55 +0000
reviewersdrno
bugs1464069
milestone62.0a1
Bug 1464069 - Check for null message in nr_stun_decode_message; r?drno MozReview-Commit-ID: B1SHDte4miv
media/mtransport/third_party/nICEr/src/stun/stun_codec.c
--- a/media/mtransport/third_party/nICEr/src/stun/stun_codec.c
+++ b/media/mtransport/third_party/nICEr/src/stun/stun_codec.c
@@ -1410,16 +1410,19 @@ nr_stun_decode_message(nr_stun_message *
     int r,_status;
     int offset;
     int size;
     int padding_bytes;
     nr_stun_message_attribute *attr;
     nr_stun_attr_info *attr_info;
     Data *password;
 
+    if (!msg)
+        ABORT(R_BAD_ARGS);
+
     r_log(NR_LOG_STUN, LOG_DEBUG, "Parsing STUN message of %d bytes", msg->length);
 
     if (!TAILQ_EMPTY(&msg->attributes))
         ABORT(R_BAD_ARGS);
 
     if (sizeof(nr_stun_message_header) > msg->length) {
        r_log(NR_LOG_STUN, LOG_WARNING, "Message too small");
        ABORT(R_FAILED);