Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2026-01-15 02:25:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge ad3d0aa1b7 into 9352d8fe93

Browse Source
This commit is contained in:
CiroZDP 2026-01-14 22:24:54 -03:00 committed by GitHub
commit e332c7d706
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/init.c
View File

@ -273,24 +273,23 @@ void* _glfw_calloc(size_t count, size_t size)
void* _glfw_realloc(void* block, size_t size) void* _glfw_realloc(void* block, size_t size)
{ {
if (block && size) if (!block)
{ return _glfw_calloc(1, size);
void* resized = _glfw.allocator.reallocate(block, size, _glfw.allocator.user);
if (resized) if (!size)
return resized;
else
{
_glfwInputError(GLFW_OUT_OF_MEMORY, NULL);
return NULL;
}
}
else if (block)
{ {
_glfw_free(block); _glfw_free(block);
return NULL; return NULL;
} }
else
return _glfw_calloc(1, size); void* resized = _glfw.allocator.reallocate(block, size, _glfw.allocator.user);
if (!resized)
{
_glfwInputError(GLFW_OUT_OF_MEMORY, NULL);
return NULL;
}
return resized;
} }
void _glfw_free(void* block) void _glfw_free(void* block)