simtactics/niotso
1
0
Fork 0
mirror of https://github.com/simtactics/niotso.git synced 2025-03-24 11:49:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Corrected the memory exhaustion trap behavior used when calling realloc

Browse source 
Two more steps are currently required to complete hitutils: write hitld, with support for multiple objects and even .a archives, and implement scan_branch_destinations in hitdump. Then we can seamless modify The Sims 1's HIT routines.
This commit is contained in:
Fatbag 2013-01-23 21:13:25 -06:00
parent 0ec39fd968
commit 558726a9f1
3 changed files with 14 additions and 9 deletions
Tools
hitutils
hitasm.chitdump.c
rtti-reader
rtti-reader.cpp

5
Tools/hitutils/hitasm.c
View file

@ -58,9 +58,10 @@ typedef struct {
} ByteWriterContext; } ByteWriterContext;
static void bw_expand(ByteWriterContext *bwc){ static void bw_expand(ByteWriterContext *bwc){
bwc->Data = realloc(bwc->Data, (bwc->Size <<= 1)); void * ptr;
if(!bwc->Data) if(bwc->Size > SIZE_MAX/2 || !(ptr = realloc(bwc->Data, bwc->Size<<=1)))
Shutdown_M("%sCould not allocate memory for %s section.\n", "hitasm: Error: ", bwc->Name); Shutdown_M("%sCould not allocate memory for %s section.\n", "hitasm: Error: ", bwc->Name);
bwc->Data = ptr;
} }
static void bw_write32(ByteWriterContext *bwc, uint32_t value){ static void bw_write32(ByteWriterContext *bwc, uint32_t value){

11
Tools/hitutils/hitdump.c
View file

@ -88,16 +88,17 @@ typedef struct {
} address_t; } address_t;
typedef struct { typedef struct {
size_t Size; size_t SizeAllocated;
size_t Count; size_t Count;
address_t * Entries; address_t * Entries;
} addresslist_t; } addresslist_t;
static address_t * add_address(addresslist_t * List){ static address_t * add_address(addresslist_t * List){
if(List->Count == List->Size){ if(List->Count*sizeof(address_t) == List->SizeAllocated){
List->Entries = realloc(List->Entries, (List->Size <<= 1) * sizeof(address_t)); void * ptr;
if(!List->Entries) if(List->SizeAllocated > SIZE_MAX/2 || !(ptr = realloc(List->Entries, (List->SizeAllocated <<= 1))))
Shutdown_M("%sCould not allocate memory for address list.\n", "hitdump: Error: "); Shutdown_M("%sCould not allocate memory for address list.\n", "hitdump: Error: ");
List->Entries = ptr;
} }
return memset(List->Entries + List->Count++, 0, sizeof(address_t)); return memset(List->Entries + List->Count++, 0, sizeof(address_t));
} }
@ -453,7 +454,7 @@ int main(int argc, char *argv[]){
** Build up the address list ** Build up the address list
*/ */
AddressList.Size = 32; AddressList.SizeAllocated = 32 * sizeof(address_t);
AddressList.Count = 0; AddressList.Count = 0;
AddressList.Entries = malloc(32 * sizeof(address_t)); AddressList.Entries = malloc(32 * sizeof(address_t));

7
Tools/rtti-reader/rtti-reader.cpp
View file

@ -82,9 +82,12 @@ struct RTTIVector {
Shutdown_M("Failed to allocate memory"); Shutdown_M("Failed to allocate memory");
} }
T& add(){ T& add(){
if((Count+1)*sizeof(T) > SizeAllocated) if((Count+1)*sizeof(T) > SizeAllocated){
if(SizeAllocated > SIZE_MAX/2 || !(Buffer = (T*) realloc(Buffer, SizeAllocated<<=1))) void * ptr;
if(SizeAllocated > SIZE_MAX/2 || !(ptr = (T*) realloc(Buffer, SizeAllocated<<=1)))
Shutdown_M("Failed to allocate memory"); Shutdown_M("Failed to allocate memory");
Buffer = (T *) ptr;
}
return Buffer[Count++]; return Buffer[Count++];
} }