CVSROOT: /sources/gnash Module name: gnash Changes by: Zou Lunkai <zoulunkai> 07/09/03 10:48:34
Modified files: server : dlist.cpp Log message: * server/dlist.cpp: don't abort for unloaded characters in DisplayList::advance(). fixd a case in bug #20076. CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/gnash/server/dlist.cpp?cvsroot=gnash&r1=1.82&r2=1.83 Patches: Index: dlist.cpp =================================================================== RCS file: /sources/gnash/gnash/server/dlist.cpp,v retrieving revision 1.82 retrieving revision 1.83 diff -u -b -r1.82 -r1.83 --- dlist.cpp 2 Sep 2007 00:12:48 -0000 1.82 +++ dlist.cpp 3 Sep 2007 10:48:34 -0000 1.83 @@ -830,7 +830,9 @@ if ( ch->isUnloaded() ) // debugging { log_error("character at depth %d is unloaded", ch->get_depth()); - abort(); + // No need to advance an unloaded character. It would be better + // if unloaded characters are not even in this list. + continue; } assert(! ch->isUnloaded() ); // we don't advance unloaded chars @@ -1005,6 +1007,7 @@ testInvariant(); + // TODO: optimize this by searching from the end(lowest depth). container_type::iterator it = find_if( _characters.begin(), _characters.end(), DepthGreaterOrEqual(newDepth)); _______________________________________________ Gnash-commit mailing list Gnash-commit@gnu.org http://lists.gnu.org/mailman/listinfo/gnash-commit