Add validation of size limit and aspect ratio args

This commit is contained in:
Camilla Berglund
2016-05-04 16:28:08 +02:00
parent e640d840b7
commit 12a695696d
2 changed files with 18 additions and 8 deletions
+13 -6
View File
@@ -521,6 +521,13 @@ GLFWAPI void glfwSetWindowSizeLimits(GLFWwindow* handle,
_GLFW_REQUIRE_INIT();
if (minwidth < 0 || minheight < 0 ||
maxwidth < minwidth || maxheight < minheight)
{
_glfwInputError(GLFW_INVALID_VALUE, "Invalid window size limits");
return;
}
window->minwidth = minwidth;
window->minheight = minheight;
window->maxwidth = maxwidth;
@@ -541,18 +548,18 @@ GLFWAPI void glfwSetWindowAspectRatio(GLFWwindow* handle, int numer, int denom)
_GLFW_REQUIRE_INIT();
if (numer <= 0 || denom <= 0)
{
_glfwInputError(GLFW_INVALID_VALUE, "Invalid window aspect ratio");
return;
}
window->numer = numer;
window->denom = denom;
if (window->monitor || !window->resizable)
return;
if (!denom)
{
_glfwInputError(GLFW_INVALID_VALUE, "Denominator cannot be zero");
return;
}
_glfwPlatformSetWindowAspectRatio(window, numer, denom);
}