[Gnash-commit] gnash/server dlist.cpp

[Vitaly Alexeev]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Vitaly Alexeev <alexeev>        06/08/23 14:08:34

Modified files:
        server         : dlist.cpp 

Log message:
        That there was no crash gnash we iterate characters through the copy of 
displaylist

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/dlist.cpp?cvsroot=gnash&r1=1.20&r2=1.21

Patches:
Index: dlist.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/dlist.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- dlist.cpp   22 Aug 2006 21:48:50 -0000      1.20
+++ dlist.cpp   23 Aug 2006 14:08:34 -0000      1.21
@@ -419,8 +419,10 @@
 
        container_type::size_type size = _characters.size();
 
-       for (iterator it = _characters.begin(),
-                       itEnd = _characters.end();
+       //Vitaly:  That there was no crash gnash we iterate through the copy
+       std::list<DisplayItem> tmp_list = _characters;  //vv
+
+       for (iterator it = tmp_list.begin(), itEnd = tmp_list.end();
                it != itEnd; ++it)
        {
                // @@@@ TODO FIX: If array changes size due to
@@ -446,11 +448,11 @@
                //
                // Need to test to see what Flash does.
 
-               if (_characters.size() != size)
-               {
-                       log_error("gnash bug: dlist size changed due to 
character actions, bailing on update!\n");
-                       break;
-               }
+//             if (_characters.size() != size)
+//             {
+//                     log_error("gnash bug: dlist size changed due to 
character actions, bailing on update!\n");
+//                     break;
+//             }
 
                // keep the character alive in case actions in it
                // will remove it from displaylist.