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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/05/14 21:57:52

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

Log message:
                * server/parser/movie_def_impl.cpp (read_all_swf): handle 
premature
                  SWF::END tag.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3213&r2=1.3214
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_def_impl.cpp?cvsroot=gnash&r1=1.69&r2=1.70

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3213
retrieving revision 1.3214
diff -u -b -r1.3213 -r1.3214
--- ChangeLog   14 May 2007 21:39:48 -0000      1.3213
+++ ChangeLog   14 May 2007 21:57:52 -0000      1.3214
@@ -1,5 +1,7 @@
 2007-05-14 Sandro Santilli <address@hidden>
 
+       * server/parser/movie_def_impl.cpp (read_all_swf): handle premature
+         SWF::END tag.
        * libbase/tu_file.{cpp,h}: changed set_position signature to return
          an int (0 for success TU_FILE_SEEK_ERROR on error).
        * server/stream.cpp (end_tag): check return from

Index: server/parser/movie_def_impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_def_impl.cpp,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -b -r1.69 -r1.70
--- server/parser/movie_def_impl.cpp    14 May 2007 08:54:20 -0000      1.69
+++ server/parser/movie_def_impl.cpp    14 May 2007 21:57:52 -0000      1.70
@@ -839,6 +839,21 @@
                                _swf_end_pos);
                 }
 
+               if (tag_type == SWF::END)
+                {
+                       if ((unsigned int) str.get_position() != _swf_end_pos)
+                        {
+                               IF_VERBOSE_MALFORMED_SWF(
+                               // Safety break, so we don't read past
+                               // the end of the  movie.
+                               log_swferror(_("Hit stream-end tag, "
+                                       "but not at the advertised SWF end; "
+                                       "stopping for safety."));
+                               )
+                               break;
+                       }
+               }
+
                SWF::TagLoadersTable::loader_function lf = NULL;
                //log_parse("tag_type = %d\n", tag_type);
                if (tag_type == SWF::SHOWFRAME)
@@ -886,21 +901,6 @@
                str.close_tag();
 
                setBytesLoaded(str.get_position());
-
-               if (tag_type == SWF::END)
-                {
-                   IF_VERBOSE_MALFORMED_SWF(
-                       if ((unsigned int) str.get_position() != _swf_end_pos)
-                        {
-                               // Safety break, so we don't read past
-                               // the end of the  movie.
-                               log_swferror(_("Hit stream-end tag, "
-                                       "but not at the advertised SWF end; "
-                                       "stopping for safety."));
-                               break;
-                       }
-                   )
-               }
        }
 
        } catch (const std::exception& e) {