LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-20 04:30:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix buffer over-read in draw_overdraw() (thanks, Boolsheet!).

Browse Source
This commit is contained in:
vrld
2012-01-15 14:36:51 +01:00
parent f6e9f4cac7
commit 1a9eafb76a
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/Graphics.cpp
+8 -9
View File
@@ -824,8 +824,8 @@ namespace opengl
GLfloat c[4]; GLfloat c[4];
glGetFloatv(GL_CURRENT_COLOR, c); glGetFloatv(GL_CURRENT_COLOR, c);
Color *colors = new Color[2*count+1]; Color *colors = new Color[2*count+2];
for (size_t i = 0; i < 2*count+1; ++i) for (size_t i = 0; i < 2*count+2; ++i)
{ {
colors[i] = Color(GLubyte(c[0] * 255.f), colors[i] = Color(GLubyte(c[0] * 255.f),
GLubyte(c[1] * 255.f), GLubyte(c[1] * 255.f),
@@ -855,16 +855,15 @@ namespace opengl
Vector p,q,r; Vector p,q,r;
bool looping = (coords[0] == coords[count-2]) && (coords[1] == coords[count-1]); bool looping = (coords[0] == coords[count-2]) && (coords[1] == coords[count-1]);
if (lineStyle == LINE_SMOOTH)
overdraw = new Vector[2*count+2];
float halfwidth = lineWidth/2.f; float halfwidth = lineWidth/2.f;
float inv_hw = 1.f / halfwidth; float inv_hw = 1.f / halfwidth;
// Overdraw changes visible line width. account for that. if (lineStyle == LINE_SMOOTH) {
// Value of 0.15 chosen empirically. overdraw = new Vector[2*count+2];
if (lineStyle == LINE_SMOOTH) // Overdraw changes visible line width. account for that.
halfwidth -= .15f; // Value of 0.2 chosen empirically.
halfwidth -= .2f;
}
// get line vertex boundaries // get line vertex boundaries
// if not looping, extend the line at the beginning, else use last point as `p' // if not looping, extend the line at the beginning, else use last point as `p'