mirror/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-10 00:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed glfwSetTime accepting invalid values.

Browse Source 
Fixes #436.
This commit is contained in:
Camilla Berglund 2015-02-19 23:49:46 +01:00
parent 11c22d6a17
commit 85de0db05d
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -62,6 +62,7 @@ GLFW bundles a number of dependencies in the `deps/` directory.
## Changelog ## Changelog
- Bugfix: `glfwSetTime` silently accepted invalid values
- [Cocoa] Bugfix: `glfwSetWindowSize` did not change the video mode for full - [Cocoa] Bugfix: `glfwSetWindowSize` did not change the video mode for full
screen windows screen windows
- [X11] Added support for Cygwin-X - [X11] Added support for Cygwin-X

2
include/GLFW/glfw3.h
View File

@ -3136,7 +3136,7 @@ GLFWAPI double glfwGetTime(void);
/*! @brief Sets the GLFW timer. /*! @brief Sets the GLFW timer.
* *
* This function sets the value of the GLFW timer. It then continues to count * This function sets the value of the GLFW timer. It then continues to count
* up from that value. * up from that value. The value must be a positive finite number.
* *
* @param[in] time The new value, in seconds. * @param[in] time The new value, in seconds.
* *

8
src/input.c
View File

@ -28,6 +28,7 @@
#include "internal.h" #include "internal.h"
#include <stdlib.h> #include <stdlib.h>
#include <float.h>
#if defined(_MSC_VER) #if defined(_MSC_VER)
#include <malloc.h> #include <malloc.h>
#endif #endif
@ -591,6 +592,13 @@ GLFWAPI double glfwGetTime(void)
GLFWAPI void glfwSetTime(double time) GLFWAPI void glfwSetTime(double time)
{ {
_GLFW_REQUIRE_INIT(); _GLFW_REQUIRE_INIT();
if (time != time || time - DBL_MAX == time || time < 0.0)
{
_glfwInputError(GLFW_INVALID_VALUE, "Invalid time");
return;
}
_glfwPlatformSetTime(time); _glfwPlatformSetTime(time);
} }