diff options
| author | Willem Jan Palenstijn | 2009-03-09 19:44:10 +0000 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2009-03-09 19:44:10 +0000 |
| commit | d2514d20b97c43402835574ef9b5d2258ac3c4a7 (patch) | |
| tree | e1a21d7007222f3b40c2444343848ec20a895aed /engines | |
| parent | f52557549542d9a3b36c73ca28c02608432ebf5f (diff) | |
| download | scummvm-rg350-d2514d20b97c43402835574ef9b5d2258ac3c4a7.tar.gz scummvm-rg350-d2514d20b97c43402835574ef9b5d2258ac3c4a7.tar.bz2 scummvm-rg350-d2514d20b97c43402835574ef9b5d2258ac3c4a7.zip | |
Reset child iterators on deletion.
This fixes an illegal access in ~TeeSongIterator.
svn-id: r39272
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/sci/sfx/iterator.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/engines/sci/sfx/iterator.cpp b/engines/sci/sfx/iterator.cpp index fe52d736f8..735d9b0625 100644 --- a/engines/sci/sfx/iterator.cpp +++ b/engines/sci/sfx/iterator.cpp @@ -1575,11 +1575,13 @@ SongIterator *TeeSongIterator::handleMessage(SongIteratorMessage msg) { 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; |