From 827029228667507c69c7a430798d7ac88e438c33 Mon Sep 17 00:00:00 2001 From: Pablo Ceballos Date: Fri, 7 Aug 2015 17:28:03 -0700 Subject: [PATCH] Explicitly construct all Rects Don't rely on the default constructor. Bug 18173359 Change-Id: I182c54a49f5eba896ddcb15cec124ecd14f347f9 --- core/jni/android_view_GraphicBuffer.cpp | 2 +- core/jni/android_view_Surface.cpp | 2 +- core/jni/android_view_TextureView.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/jni/android_view_GraphicBuffer.cpp b/core/jni/android_view_GraphicBuffer.cpp index aa79d705e8b43..17d2a5eddbf8d 100644 --- a/core/jni/android_view_GraphicBuffer.cpp +++ b/core/jni/android_view_GraphicBuffer.cpp @@ -158,7 +158,7 @@ static jboolean android_view_GraphicBuffer_lockCanvas(JNIEnv* env, jobject, sp buffer(wrapper->buffer); - Rect rect; + Rect rect(Rect::EMPTY_RECT); if (dirtyRect) { rect.left = GET_INT(dirtyRect, gRectClassInfo.left); rect.top = GET_INT(dirtyRect, gRectClassInfo.top); diff --git a/core/jni/android_view_Surface.cpp b/core/jni/android_view_Surface.cpp index abd2409a70a47..4a311d31bd82f 100644 --- a/core/jni/android_view_Surface.cpp +++ b/core/jni/android_view_Surface.cpp @@ -292,7 +292,7 @@ static jlong nativeLockCanvas(JNIEnv* env, jclass clazz, return 0; } - Rect dirtyRect; + Rect dirtyRect(Rect::EMPTY_RECT); Rect* dirtyRectPtr = NULL; if (dirtyRectObj) { diff --git a/core/jni/android_view_TextureView.cpp b/core/jni/android_view_TextureView.cpp index 7e05793a52339..beb83b1e01fad 100644 --- a/core/jni/android_view_TextureView.cpp +++ b/core/jni/android_view_TextureView.cpp @@ -142,7 +142,7 @@ static jboolean android_view_TextureView_lockCanvas(JNIEnv* env, jobject, ANativeWindow_Buffer buffer; - Rect rect; + Rect rect(Rect::EMPTY_RECT); if (dirtyRect) { rect.left = GET_INT(dirtyRect, gRectClassInfo.left); rect.top = GET_INT(dirtyRect, gRectClassInfo.top);