LineageOS/android_vendor_qcom_opensource_display-commonsys-intf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "hwc: fix crop validation issue in copybit."

Browse Source
This commit is contained in:
Linux Build Service Account
2015-03-06 23:41:39 -08:00
committed by Gerrit - the friendly Code Review server
parent eac9935fe8 17fabdba25
commit ccbe5a4fc8
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libcopybit/copybit.cpp
View File

@@ -122,6 +122,10 @@ static void intersect(struct copybit_rect_t *out,
out->b = min(lhs->b, rhs->b); out->b = min(lhs->b, rhs->b);
} }
static bool validateCopybitRect(struct copybit_rect_t *rect) {
return ((rect->b > rect->t) && (rect->r > rect->l)) ;
}
/** convert COPYBIT_FORMAT to MDP format */ /** convert COPYBIT_FORMAT to MDP format */
static int get_format(int format) { static int get_format(int format) {
switch (format) { switch (format) {
@@ -161,7 +165,7 @@ static void set_image(struct mdp_img *img, const struct copybit_image_t *rhs)
img->memory_id = hnd->fd; img->memory_id = hnd->fd;
} }
/** setup rectangles */ /** setup rectangles */
static void set_rects(struct copybit_context_t *dev, static bool set_rects(struct copybit_context_t *dev,
struct mdp_blit_req *e, struct mdp_blit_req *e,
const struct copybit_rect_t *dst, const struct copybit_rect_t *dst,
const struct copybit_rect_t *src, const struct copybit_rect_t *src,
@@ -169,6 +173,9 @@ static void set_rects(struct copybit_context_t *dev,
struct copybit_rect_t clip; struct copybit_rect_t clip;
intersect(&clip, scissor, dst); intersect(&clip, scissor, dst);
if (!validateCopybitRect(&clip))
return false;
e->dst_rect.x = clip.l; e->dst_rect.x = clip.l;
e->dst_rect.y = clip.t; e->dst_rect.y = clip.t;
e->dst_rect.w = clip.r - clip.l; e->dst_rect.w = clip.r - clip.l;
@@ -212,6 +219,7 @@ static void set_rects(struct copybit_context_t *dev,
e->src_rect.x = (src->l + src->r) - (e->src_rect.x + e->src_rect.w); e->src_rect.x = (src->l + src->r) - (e->src_rect.x + e->src_rect.w);
} }
} }
return true;
} }
/** setup mdp request */ /** setup mdp request */
@@ -524,7 +532,8 @@ static int stretch_copybit(
set_infos(ctx, req, flags); set_infos(ctx, req, flags);
set_image(&req->dst, dst); set_image(&req->dst, dst);
set_image(&req->src, src); set_image(&req->src, src);
set_rects(ctx, req, dst_rect, src_rect, &clip); if (set_rects(ctx, req, dst_rect, src_rect, &clip) == false)
continue;
if (req->src_rect.w<=0 || req->src_rect.h<=0) if (req->src_rect.w<=0 || req->src_rect.h<=0)
continue; continue;