thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCI: Added workaround for Common::Array<T>::resize() not zero-initing newly allocated memory if T is a scaler type, pointer, POD type. At least on OS X

Browse source 
svn-id: r40372
This commit is contained in:
Max Horn 2009-05-08 09:52:51 +00:00
parent bb03043b16
commit 76a48947de
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
engines/sci/engine/seg_manager.cpp
View file

@ -84,6 +84,8 @@ SegManager::SegManager(bool sci1_1) {
reserved_id--; // reserved_id runs in the reversed direction to make sure no one will use it.
_heap.resize(DEFAULT_SCRIPTS);
for (uint i = 0; i < _heap.size(); ++i)
_heap[i] = 0;
Clones_seg_id = 0;
Lists_seg_id = 0;
@ -346,11 +348,14 @@ MemObject *SegManager::memObjAllocate(SegmentId segid, int hash_id, MemObjectTyp
}
if (segid >= (int)_heap.size()) {
if (segid >= (int)_heap.size() * 2) {
const int oldSize = _heap.size();
if (segid >= oldSize * 2) {
sciprintf("SegManager: hash_map error or others??");
return NULL;
}
_heap.resize(_heap.size() * 2);
_heap.resize(oldSize * 2);
for (int i = oldSize; i < oldSize * 2; ++i)
_heap[i] = 0;
}
mem->_segmgrId = hash_id;