Aurelien
/
xf86-video-intel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i915: Check for overflow before overflowing. 

As the immediate victim of the overflow would be to overwrite the maximum
permissible value, the test was optimistic.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2009-11-10 11:09:52 +00:00
parent 67af5a9925
commit 33cabbfca6
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/i915_3d.h
View File

@ -420,8 +420,8 @@ do { \
*/
#define FS_LOCALS(x) \
uint32_t _shader_buf[(x) * 3]; \
int _max_shader_commands = x; \
int _cur_shader_commands
unsigned int _max_shader_commands = x; \
unsigned int _cur_shader_commands
#define FS_BEGIN() \
do { \
@ -430,12 +430,13 @@ do { \
#define FS_OUT(_shaderop) \
do { \
if (_cur_shader_commands >= _max_shader_commands) \
FatalError("fragment shader command buffer exceeded (%d)\n", \
_cur_shader_commands); \
_shader_buf[_cur_shader_commands * 3 + 0] = _shaderop.ui[0]; \
_shader_buf[_cur_shader_commands * 3 + 1] = _shaderop.ui[1]; \
_shader_buf[_cur_shader_commands * 3 + 2] = _shaderop.ui[2]; \
if (++_cur_shader_commands > _max_shader_commands) \
FatalError("fragment shader command buffer exceeded (%d)\n", \
_cur_shader_commands); \
++_cur_shader_commands; \
} while (0)
#define FS_END() \