[Ffmpeg-cvslog] r8002 - trunk/libavformat/ipmovie.c

[michael]

Author: michael
Date: Sat Feb 17 03:46:47 2007
New Revision: 8002

Modified:
   trunk/libavformat/ipmovie.c

Log:
not checking error return, resulting double free
returning uninitalized pointers


Modified: trunk/libavformat/ipmovie.c
==============================================================================
--- trunk/libavformat/ipmovie.c	(original)
+++ trunk/libavformat/ipmovie.c	Sat Feb 17 03:46:47 2007
@@ -227,7 +227,7 @@
 
     /* see if there are any pending packets */
     chunk_type = load_ipmovie_packet(s, pb, pkt);
-    if ((chunk_type == CHUNK_VIDEO) && (chunk_type != CHUNK_DONE))
+    if (chunk_type != CHUNK_DONE)
         return chunk_type;
 
     /* read the next chunk, wherever the file happens to be pointing */
@@ -601,8 +601,10 @@
         ret = AVERROR_IO;
     else if (ret == CHUNK_NOMEM)
         ret = AVERROR_NOMEM;
-    else
+    else if (ret == CHUNK_VIDEO)
         ret = 0;
+    else
+        ret = -1;
 
     return ret;
 }