thirdpartymirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2025-10-30 08:01:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix crash when surfaces fail to allocate

Browse source
This commit is contained in:
MysterD 2022-02-27 00:53:58 -08:00
parent e16f3eb075
commit a35d759a46
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/engine/surface_load.c
View file

@ -71,6 +71,7 @@ static struct Surface *alloc_surface(void) {
// we, um... // we, um...
// Perhaps originally just debug feedback? // Perhaps originally just debug feedback?
if (gSurfacesAllocated >= sSurfacePoolSize) { if (gSurfacesAllocated >= sSurfacePoolSize) {
return NULL;
} }
surface->type = 0; surface->type = 0;
@ -363,6 +364,7 @@ static struct Surface *read_surface_data(s16 *vertexData, s16 **vertexIndices) {
nz *= mag; nz *= mag;
surface = alloc_surface(); surface = alloc_surface();
if (surface == NULL) { return NULL; }
vec3s_copy(surface->prevVertex1, surface->vertex1); vec3s_copy(surface->prevVertex1, surface->vertex1);
vec3s_copy(surface->prevVertex2, surface->vertex2); vec3s_copy(surface->prevVertex2, surface->vertex2);

1
src/pc/lua/smlua_obj_utils.c
View file

@ -22,6 +22,7 @@ static struct Object* spawn_object_internal(enum BehaviorId behaviorId, enum Mod
} }
struct Object* obj = spawn_object(gMarioStates[0].marioObj, loadedModelId, behavior); struct Object* obj = spawn_object(gMarioStates[0].marioObj, loadedModelId, behavior);
if (obj == NULL) { if (obj == NULL) {
LOG_ERROR("failed to allocate object"); LOG_ERROR("failed to allocate object");
return NULL; return NULL;