[SCM] libav/experimental: 7l trocadero: reading right into enum variable may cause unwanted effects, use intermediate buffer for reading value instead in RTMP protocol handler.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:55:16 UTC 2013


The following commit has been merged in the experimental branch:
commit 1ab21f1980080d697cd6f873083a5465d2d7cea6
Author: Kostya Shishkov <kostya.shishkov at gmail.com>
Date:   Tue Dec 1 14:58:17 2009 +0000

    7l trocadero: reading right into enum variable may cause unwanted effects, use
    intermediate buffer for reading value instead in RTMP protocol handler.
    
    Originally committed as revision 20682 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/rtmppkt.c b/libavformat/rtmppkt.c
index 063a887..8f9d71d 100644
--- a/libavformat/rtmppkt.c
+++ b/libavformat/rtmppkt.c
@@ -102,8 +102,9 @@ int ff_rtmp_packet_read(URLContext *h, RTMPPacket *p,
             if (url_read_complete(h, buf, 3) != 3)
                 return AVERROR(EIO);
             data_size = AV_RB24(buf);
-            if (url_read_complete(h, &type, 1) != 1)
+            if (url_read_complete(h, buf, 1) != 1)
                 return AVERROR(EIO);
+            type = buf[0];
             if (hdr == RTMP_PS_TWELVEBYTES) {
                 if (url_read_complete(h, buf, 4) != 4)
                     return AVERROR(EIO);

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list