[Gnash-commit] gnash ChangeLog server/parser/video_stream_def.cpp

[Tomas Groth]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Tomas Groth <tgc>       07/10/26 23:30:25

Modified files:
        .              : ChangeLog 
        server/parser  : video_stream_def.cpp 

Log message:
                * server/parser/video_stream_def.cpp: Check if iterator is 
valid, before
                  using it. Fixes bug #21442.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4723&r2=1.4724
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/video_stream_def.cpp?cvsroot=gnash&r1=1.24&r2=1.25

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4723
retrieving revision 1.4724
diff -u -b -r1.4723 -r1.4724
--- ChangeLog   26 Oct 2007 22:56:06 -0000      1.4723
+++ ChangeLog   26 Oct 2007 23:30:24 -0000      1.4724
@@ -1,3 +1,8 @@
+2007-10-26 Tomas Groth Christensen <address@hidden>
+
+       * server/parser/video_stream_def.cpp: Check if iterator is valid, before
+         using it. Fixes bug #21442.
+
 2007-10-26 Sandro Santilli <address@hidden>
 
        * server/as_prop_flags.h: add version-based ignore flags.

Index: server/parser/video_stream_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/video_stream_def.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- server/parser/video_stream_def.cpp  26 Oct 2007 18:43:36 -0000      1.24
+++ server/parser/video_stream_def.cpp  26 Oct 2007 23:30:25 -0000      1.25
@@ -16,7 +16,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // 
-// $Id: video_stream_def.cpp,v 1.24 2007/10/26 18:43:36 tgc Exp $
+// $Id: video_stream_def.cpp,v 1.25 2007/10/26 23:30:25 tgc Exp $
 
 #include "video_stream_def.h"
 #include "video_stream_instance.h"
@@ -166,10 +166,10 @@
        // rewind to the nearest keyframe, or the last frame we decoded
        while (static_cast<uint32_t>(m_last_decoded_frame+1) != it->first && 
it->second->frameType != KEY_FRAME && it != m_video_frames.begin()) it--;
 
-       std::auto_ptr<image::image_base> ret;
+       std::auto_ptr<image::image_base> ret(NULL);
 
        // Decode all the frames needed to produce the requested one
-       while (it->first <= frameNum && it != m_video_frames.end()) {
+       while (it != m_video_frames.end() && it->first <= frameNum) {
                // If this is a disposable interlaced frame, and it is not the
                // last one to be decoded, we skip the decoding.
                if (!(it->second->frameType == DIS_INTER_FRAME && it->first != 
frameNum)) {