[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/30 10:25:21

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

Log message:
                * server/parser/movie_def_impl.cpp (read_all_swf):
                  Don't discard anything past the last SHOWFRAME,
                  as Ming seems to still put EXPORTASSETS after it
                  (possibly bogus, but we want to accept it).

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

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2193
retrieving revision 1.2194
diff -u -b -r1.2193 -r1.2194
--- ChangeLog   30 Jan 2007 09:58:05 -0000      1.2193
+++ ChangeLog   30 Jan 2007 10:25:21 -0000      1.2194
@@ -1,3 +1,10 @@
+2007-01-30 Sandro Santilli <address@hidden>
+
+       * server/parser/movie_def_impl.cpp (read_all_swf):
+         Don't discard anything past the last SHOWFRAME,
+         as Ming seems to still put EXPORTASSETS after it
+         (possibly bogus, but we want to accept it).
+
 2007-01-30 Tomas Groth Christensen <address@hidden>
 
        * server/asobj/NetStreamGst.cpp: Fixed wrong return type.

Index: server/parser/movie_def_impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_def_impl.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- server/parser/movie_def_impl.cpp    29 Jan 2007 18:35:59 -0000      1.57
+++ server/parser/movie_def_impl.cpp    30 Jan 2007 10:25:21 -0000      1.58
@@ -836,6 +836,8 @@
 
                SWF::tag_type tag_type = str.open_tag();
 
+parse_tag:
+
                if (s_progress_function != NULL)
                 {
                        s_progress_function((uint32_t)str.get_position(),
@@ -856,20 +858,17 @@
                        if ( _frames_loaded == m_frame_count )
                        {
                                str.close_tag();
-                               if ( str.open_tag() != SWF::END )
+                               tag_type = str.open_tag();
+                               if ( tag_type != SWF::END )
                                {
                                        IF_VERBOSE_MALFORMED_SWF(
                                        log_swferror("last expected SHOWFRAME "
-                                               "in SWF stream "
-                                               "isn't followed by an END. "
-                                               "Discarding the rest.");
+                                               "in SWF stream '%s' isn't "
+                                               "followed by an END (%d).",
+                                               get_url().c_str(), tag_type);
                                        );
                                }
-                               // WARNING: might not match with SWF size
-                               //          advertised in header
-                               setBytesLoaded(str.get_position());
-                               str.close_tag();
-                               break;
+                               goto parse_tag;
                        }
 
                }