AerialX/openal-soft-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix source and buffer out-of-memory conditions

Browse Source
This commit is contained in:
Chris Robinson 2008-01-15 16:30:43 -08:00
parent a6213ebfc7
commit a11f25e47b
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
OpenAL32/alBuffer.c
View File

@ -95,20 +95,20 @@ ALAPI ALvoid ALAPIENTRY alGenBuffers(ALsizei n,ALuint *puiBuffers)
while(i < n) while(i < n)
{ {
*list = calloc(1, sizeof(ALbuffer)); *list = calloc(1, sizeof(ALbuffer));
if(*list) if(!(*list))
{ {
puiBuffers[i] = (ALuint)ALTHUNK_ADDENTRY(*list); alDeleteBuffers(i, puiBuffers);
(*list)->state = UNUSED; alSetError(AL_OUT_OF_MEMORY);
g_uiBufferCount++; break;
i++;
list = &(*list)->next;
} }
}
// If we didn't create all the Buffers, we must have run out of memory puiBuffers[i] = (ALuint)ALTHUNK_ADDENTRY(*list);
if (i != n) (*list)->state = UNUSED;
alSetError(AL_OUT_OF_MEMORY); g_uiBufferCount++;
i++;
list = &(*list)->next;
}
} }
else else
{ {

26
OpenAL32/alSource.c
View File

@ -65,22 +65,22 @@ ALAPI ALvoid ALAPIENTRY alGenSources(ALsizei n,ALuint *sources)
while(i < n) while(i < n)
{ {
*list = calloc(1, sizeof(ALsource)); *list = calloc(1, sizeof(ALsource));
if(*list) if(!(*list))
{ {
sources[i]=(ALuint)ALTHUNK_ADDENTRY(*list); alDeleteSources(i, sources);
(*list)->source = sources[i]; alSetError(AL_OUT_OF_MEMORY);
break;
InitSourceParams(*list);
Context->SourceCount++;
i++;
list = &(*list)->next;
} }
}
// If we didn't create all the Sources, we must have run out or memory sources[i] = (ALuint)ALTHUNK_ADDENTRY(*list);
if(i != n) (*list)->source = sources[i];
alSetError(AL_OUT_OF_MEMORY);
InitSourceParams(*list);
Context->SourceCount++;
i++;
list = &(*list)->next;
}
} }
else else
{ {