[libav-stable] rtp: Make sure priv_data is set before reading it

Martin Storsjö git at libav.org
Wed Jan 23 22:31:05 CET 2013


Module: libav
Branch: master
Commit: e90820d4f815c15796e642467cdddbad755212a2

Author:    Martin Storsjö <martin at martin.st>
Committer: Martin Storsjö <martin at martin.st>
Date:      Wed Jan 23 21:38:41 2013 +0200

rtp: Make sure priv_data is set before reading it

This fixes crashes with muxing H263 into RTSP.

CC: libav-stable at libav.org
Signed-off-by: Martin Storsjö <martin at martin.st>

---

 libavformat/rtp.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libavformat/rtp.c b/libavformat/rtp.c
index dfe97de..d1c6ed0 100644
--- a/libavformat/rtp.c
+++ b/libavformat/rtp.c
@@ -104,7 +104,7 @@ int ff_rtp_get_payload_type(AVFormatContext *fmt,
     for (i = 0; rtp_payload_types[i].pt >= 0; ++i)
         if (rtp_payload_types[i].codec_id == codec->codec_id) {
             if (codec->codec_id == AV_CODEC_ID_H263 && (!fmt ||
-                !fmt->oformat->priv_class ||
+                !fmt->oformat->priv_class || !fmt->priv_data ||
                 !av_opt_flag_is_set(fmt->priv_data, "rtpflags", "rfc2190")))
                 continue;
             /* G722 has 8000 as nominal rate even if the sample rate is 16000,



More information about the libav-stable mailing list