From 76bbe247fadb370ed295641c34e063fdcf95e215 Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Mon, 10 Feb 2014 15:36:26 -0800
Subject: [PATCH] Correctly limit bounds in PutImageData to prevent segment
fault.
---
src/CanvasRenderingContext2d.cc | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/CanvasRenderingContext2d.cc b/src/CanvasRenderingContext2d.cc
index a6c1621..e74e491 100644
--- a/src/CanvasRenderingContext2d.cc
+++ b/src/CanvasRenderingContext2d.cc
@@ -523,8 +523,8 @@ NAN_METHOD(Context2d::PutImageData) {
switch (args.Length()) {
// imageData, dx, dy
case 3:
- cols = arr->width();
- rows = arr->height();
+ cols = std::min(arr->width(), context->canvas()->width - dx);
+ rows = std::min(arr->height(), context->canvas()->height - dy);
break;
// imageData, dx, dy, sx, sy, sw, sh
case 7:
@@ -536,16 +536,17 @@ NAN_METHOD(Context2d::PutImageData) {
if (sy < 0) sh += sy, sy = 0;
if (sx + sw > arr->width()) sw = arr->width() - sx;
if (sy + sh > arr->height()) sh = arr->height() - sy;
- if (sw <= 0 || sh <= 0) NanReturnUndefined();
- cols = sw;
- rows = sh;
dx += sx;
dy += sy;
+ cols = std::min(sw, context->canvas()->width - dx);
+ rows = std::min(sh, context->canvas()->height - dy);
break;
default:
return NanThrowError("invalid arguments");
}
+ if (cols <= 0 || rows <= 0) NanReturnUndefined();
+
uint8_t *srcRows = src + sy * srcStride + sx * 4;
for (int y = 0; y < rows; ++y) {
uint32_t *row = (uint32_t *)(dst + dstStride * (y + dy));