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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/01/29 18:35:59

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

Log message:
                * server/parser/movie_def_impl.cpp (read_all_swf): when last
                  expected SHOWFRAME tag is hit, discard the rest and warn
                  user if next tag is not an END. This happens when Ming users
                  forget to call SWFMovie_nextFrame() as last thing before 
output.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2187&r2=1.2188
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_def_impl.cpp?cvsroot=gnash&r1=1.56&r2=1.57

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2187
retrieving revision 1.2188
diff -u -b -r1.2187 -r1.2188
--- ChangeLog   29 Jan 2007 18:24:42 -0000      1.2187
+++ ChangeLog   29 Jan 2007 18:35:58 -0000      1.2188
@@ -1,3 +1,10 @@
+2007-01-29 Sandro Santilli <address@hidden>
+
+       * server/parser/movie_def_impl.cpp (read_all_swf): when last
+         expected SHOWFRAME tag is hit, discard the rest and warn
+         user if next tag is not an END. This happens when Ming users
+         forget to call SWFMovie_nextFrame() as last thing before output.
+
 2007-01-29 Ann Barcomb <address@hidden>
 
        * Removed reference to '--disable-xml' option in doc/C/sources.xml.

Index: server/parser/movie_def_impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_def_impl.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- server/parser/movie_def_impl.cpp    10 Jan 2007 17:28:50 -0000      1.56
+++ server/parser/movie_def_impl.cpp    29 Jan 2007 18:35:59 -0000      1.57
@@ -853,6 +853,24 @@
                        );
 
                        incrementLoadedFrames();
+                       if ( _frames_loaded == m_frame_count )
+                       {
+                               str.close_tag();
+                               if ( str.open_tag() != SWF::END )
+                               {
+                                       IF_VERBOSE_MALFORMED_SWF(
+                                       log_swferror("last expected SHOWFRAME "
+                                               "in SWF stream "
+                                               "isn't followed by an END. "
+                                               "Discarding the rest.");
+                                       );
+                               }
+                               // WARNING: might not match with SWF size
+                               //          advertised in header
+                               setBytesLoaded(str.get_position());
+                               str.close_tag();
+                               break;
+                       }
 
                }
                else if (_tag_loaders.get(tag_type, &lf))