Zengtudor
/
glfw
mirror of https://github.com/glfw/glfw.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into multi-monitor

This commit is contained in:
Camilla Berglund 2012-10-02 17:24:50 +02:00
parent 464619d5c8 21a015778f
commit 88fb5c1cf3
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/window.c
View File

@ -302,15 +302,13 @@ GLFWAPI GLFWwindow glfwCreateWindow(int width, int height,
height = 480; height = 480;
} }
window = (_GLFWwindow*) malloc(sizeof(_GLFWwindow)); window = (_GLFWwindow*) calloc(1, sizeof(_GLFWwindow));
if (!window) if (!window)
{ {
_glfwSetError(GLFW_OUT_OF_MEMORY, NULL); _glfwSetError(GLFW_OUT_OF_MEMORY, NULL);
return NULL; return NULL;
} }
memset(window, 0, sizeof(_GLFWwindow));
window->next = _glfwLibrary.windowListHead; window->next = _glfwLibrary.windowListHead;
_glfwLibrary.windowListHead = window; _glfwLibrary.windowListHead = window;