[FFmpeg-cvslog] rtspdec: Fix use of uninitialized byte

Michael Niedermayer git at videolan.org
Sat Oct 13 14:21:34 CEST 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Oct 11 23:57:08 2012 +0200| [eae35eadc0ae943598ed3f971245fe39a1cd213b] | committer: Martin Storsjö

rtspdec: Fix use of uninitialized byte

ffurl_read_complete can return 0 as well as negative error codes.

Signed-off-by: Martin Storsjö <martin at martin.st>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=eae35eadc0ae943598ed3f971245fe39a1cd213b
---

 libavformat/rtspdec.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavformat/rtspdec.c b/libavformat/rtspdec.c
index 7476c45..d46f1a4 100644
--- a/libavformat/rtspdec.c
+++ b/libavformat/rtspdec.c
@@ -76,8 +76,8 @@ static inline int read_line(AVFormatContext *s, char *rbuf, const int rbufsize,
 
     do {
         ret = ffurl_read_complete(rt->rtsp_hd, rbuf + idx, 1);
-        if (ret < 0)
-            return ret;
+        if (ret <= 0)
+            return ret ? ret : AVERROR_EOF;
         if (rbuf[idx] == '\r') {
             /* Ignore */
         } else if (rbuf[idx] == '\n') {



More information about the ffmpeg-cvslog mailing list