From 5bef70b34d95a7c4bb5ce55cf6502fce5c0e2ef8 Mon Sep 17 00:00:00 2001 From: wen xing liao <39575994+xmliaowx@users.noreply.github.com> Date: Tue, 30 Oct 2018 11:59:31 +0800 Subject: [PATCH] fix java IllegalArgumentException (#1570) * fix java IllegalArgumentException * Remove multiple parameter checks --- .../android/CCCanvasRenderingContext2D-android.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/native/cocos/platform/android/CCCanvasRenderingContext2D-android.cpp b/native/cocos/platform/android/CCCanvasRenderingContext2D-android.cpp index f2b498910f..977520781e 100644 --- a/native/cocos/platform/android/CCCanvasRenderingContext2D-android.cpp +++ b/native/cocos/platform/android/CCCanvasRenderingContext2D-android.cpp @@ -110,6 +110,12 @@ public: { if (_bufferWidth < 1.0f || _bufferHeight < 1.0f) return; + if (x >= _bufferWidth || y >= _bufferHeight) + return; + if (x + w > _bufferWidth) + w = _bufferWidth - x; + if (y + h > _bufferHeight) + h = _bufferHeight - y; JniHelper::callObjectVoidMethod(_obj, JCLS_CANVASIMPL, "clearRect", x, y, w, h); fillData(); } @@ -118,6 +124,12 @@ public: { if (_bufferWidth < 1.0f || _bufferHeight < 1.0f) return; + if (x >= _bufferWidth || y >= _bufferHeight) + return; + if (x + w > _bufferWidth) + w = _bufferWidth - x; + if (y + h > _bufferHeight) + h = _bufferHeight - y; JniHelper::callObjectVoidMethod(_obj, JCLS_CANVASIMPL, "fillRect", x, y, w, h); fillData(); }