ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "SurfaceFlinger: Fix rect out-of-bounds checks"

Browse Source
This commit is contained in:
Dan Stoza 2014-06-19 17:46:47 +00:00 committed by Android (Google) Code Review
commit eac96b9bfd
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
services/surfaceflinger/SurfaceFlinger.cpp
View File

@ -2873,14 +2873,14 @@ void SurfaceFlinger::renderScreenImplLocked(
if (sourceCrop.left < 0) { if (sourceCrop.left < 0) {
ALOGE("Invalid crop rect: l = %d (< 0)", sourceCrop.left); ALOGE("Invalid crop rect: l = %d (< 0)", sourceCrop.left);
} }
if (sourceCrop.right >= hw_w) { if (sourceCrop.right > hw_w) {
ALOGE("Invalid crop rect: r = %d (>= %d)", sourceCrop.right, hw_w); ALOGE("Invalid crop rect: r = %d (> %d)", sourceCrop.right, hw_w);
} }
if (sourceCrop.top < 0) { if (sourceCrop.top < 0) {
ALOGE("Invalid crop rect: t = %d (< 0)", sourceCrop.top); ALOGE("Invalid crop rect: t = %d (< 0)", sourceCrop.top);
} }
if (sourceCrop.bottom >= hw_h) { if (sourceCrop.bottom > hw_h) {
ALOGE("Invalid crop rect: b = %d (>= %d)", sourceCrop.bottom, hw_h); ALOGE("Invalid crop rect: b = %d (> %d)", sourceCrop.bottom, hw_h);
} }
// make sure to clear all GL error flags // make sure to clear all GL error flags