[Scummvm-cvs-logs] SF.net SVN: scummvm:[39272] scummvm/trunk/engines/sci/sfx/iterator.cpp

[wjpalenstijn at users.sourceforge.net]

Revision: 39272
          http://scummvm.svn.sourceforge.net/scummvm/?rev=39272&view=rev
Author:   wjpalenstijn
Date:     2009-03-09 19:44:10 +0000 (Mon, 09 Mar 2009)

Log Message:
-----------
Reset child iterators on deletion.
This fixes an illegal access in ~TeeSongIterator.

Modified Paths:
--------------
    scummvm/trunk/engines/sci/sfx/iterator.cpp

Modified: scummvm/trunk/engines/sci/sfx/iterator.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/iterator.cpp	2009-03-09 18:19:53 UTC (rev 39271)
+++ scummvm/trunk/engines/sci/sfx/iterator.cpp	2009-03-09 19:44:10 UTC (rev 39272)
@@ -1575,11 +1575,13 @@
 				return NULL;
 			} else if (!(_status & TEE_LEFT_ACTIVE)) {
 				delete _children[TEE_LEFT].it;
+				_children[TEE_LEFT].it = 0;
 				old_it = _children[TEE_RIGHT].it;
 				delete this;
 				return old_it;
 			} else if (!(_status & TEE_RIGHT_ACTIVE)) {
 				delete _children[TEE_RIGHT].it;
+				_children[TEE_RIGHT].it = 0;
 				old_it = _children[TEE_LEFT].it;
 				delete this;
 				return old_it;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.