Merge pull request #5432 from mdboom/fix-segfault-in-text-drawing

jenshnielsen · jenshnielsen · commit 51291360b404 · 2015-11-08T14:28:30.000Z
Don't draw text when it's completely clipped away
diff --git a/src/_backend_agg.h b/src/_backend_agg.h
@@ -788,9 +788,11 @@ inline void RendererAgg::draw_text_image(GCAgg &gc, ImageArray &image, int x, in
             text.clip(clip);
         }
 
-        for (int yi = text.y1; yi < text.y2; ++yi) {
-            pixFmt.blend_solid_hspan(text.x1, yi, (text.x2 - text.x1), gc.color,
-                                     &image(yi - (y - image.dim(0)), text.x1 - x));
+        if (text.x2 > text.x1) {
+            for (int yi = text.y1; yi < text.y2; ++yi) {
+                pixFmt.blend_solid_hspan(text.x1, yi, (text.x2 - text.x1), gc.color,
+                                         &image(yi - (y - image.dim(0)), text.x1 - x));
+            }
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -788,9 +788,11 @@ inline void RendererAgg::draw_text_image(GCAgg &gc, ImageArray &image, int x, in`
`788`	`788`	`text.clip(clip);`
`789`	`789`	`}`
`790`	`790`
`791`		`- for (int yi = text.y1; yi < text.y2; ++yi) {`
`792`		`- pixFmt.blend_solid_hspan(text.x1, yi, (text.x2 - text.x1), gc.color,`
`793`		`- &image(yi - (y - image.dim(0)), text.x1 - x));`
	`791`	`+ if (text.x2 > text.x1) {`
	`792`	`+ for (int yi = text.y1; yi < text.y2; ++yi) {`
	`793`	`+ pixFmt.blend_solid_hspan(text.x1, yi, (text.x2 - text.x1), gc.color,`
	`794`	`+ &image(yi - (y - image.dim(0)), text.x1 - x));`
	`795`	`+ }`
`794`	`796`	`}`
`795`	`797`	`}`
`796`	`798`	`}`