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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/04/02 01:05:03

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

Log message:
                * server/parser/movie_def_impl.cpp (read_all_swf): on end of 
stream
                  update loaded frames count to match advertised number. This is
                  now the same handling for definesprite. While we have 
automated
                  test for the sprite case (swfmill testsuite) we don't have one
                  for the root movie case, but swfdec's 
crash-0.5.5-cvs-truncated
                  series of tests seem to be less race-condition prone with this
                  patch.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6148&r2=1.6149
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_def_impl.cpp?cvsroot=gnash&r1=1.101&r2=1.102

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6148
retrieving revision 1.6149
diff -u -b -r1.6148 -r1.6149
--- ChangeLog   1 Apr 2008 23:45:54 -0000       1.6148
+++ ChangeLog   2 Apr 2008 01:05:01 -0000       1.6149
@@ -1,5 +1,12 @@
 2008-04-01 Sandro Santilli <address@hidden>
 
+       * server/parser/movie_def_impl.cpp (read_all_swf): on end of stream
+         update loaded frames count to match advertised number. This is
+         now the same handling for definesprite. While we have automated
+         test for the sprite case (swfmill testsuite) we don't have one
+         for the root movie case, but swfdec's crash-0.5.5-cvs-truncated
+         series of tests seem to be less race-condition prone with this
+         patch.
        * libamf/sol.cpp (writeFile): fix write of BOOLEAN elements.
 
 2008-04-01 Sandro Santilli <address@hidden>

Index: server/parser/movie_def_impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_def_impl.cpp,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -b -r1.101 -r1.102
--- server/parser/movie_def_impl.cpp    19 Feb 2008 19:20:56 -0000      1.101
+++ server/parser/movie_def_impl.cpp    2 Apr 2008 01:05:02 -0000       1.102
@@ -820,9 +820,10 @@
        {
                IF_VERBOSE_MALFORMED_SWF(
                log_swferror(_(SIZET_FMT " frames advertised in header, but 
only " SIZET_FMT " SHOWFRAME tags "
-                       "found in stream. Updating total frames count"), 
m_frame_count, floaded);
+                       "found in stream. Pretending we loaded all advertised 
frames"), m_frame_count, floaded);
                );
-               m_frame_count = floaded;
+               boost::mutex::scoped_lock lock(_frames_loaded_mutex);
+               _frames_loaded = m_frame_count;
                // Notify any thread waiting on frame reached condition
                _frame_reached_condition.notify_all();
        }