From 5db0b81f7c1c7c18c11fe06e58892ed64e347ef1 Mon Sep 17 00:00:00 2001 From: Nicolas Silva Date: Fri, 15 Jun 2018 14:01:07 -0700 Subject: Bug 1464039 - Reject some invalid transforms in qcms. r=mwoodrow, a=RyanVM --- gfx/qcms/chain.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gfx/qcms/chain.c') diff --git a/gfx/qcms/chain.c b/gfx/qcms/chain.c index e382fbe00..2b0e707c4 100644 --- a/gfx/qcms/chain.c +++ b/gfx/qcms/chain.c @@ -972,6 +972,10 @@ static float* qcms_modular_transform_data(struct qcms_modular_transform *transfo assert(0 && "Unsupported transform module"); return NULL; } + if (transform->grid_size <= 0) { + assert(0 && "Invalid transform"); + return NULL; + } transform->transform_module_fn(transform,src,dest,len); dest = src; src = new_src; -- cgit v1.2.3 From 3858dd6de2f4d510b42ca8675235469b8b78ed02 Mon Sep 17 00:00:00 2001 From: Nicolas Silva Date: Tue, 19 Jun 2018 15:32:29 +0200 Subject: Bug 1464039 - Only reject qcms transform with invalid grid size if the transform function uses the grid size. r=Bas a=jcristau --- gfx/qcms/chain.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gfx/qcms/chain.c') diff --git a/gfx/qcms/chain.c b/gfx/qcms/chain.c index 2b0e707c4..dbae18378 100644 --- a/gfx/qcms/chain.c +++ b/gfx/qcms/chain.c @@ -972,7 +972,9 @@ static float* qcms_modular_transform_data(struct qcms_modular_transform *transfo assert(0 && "Unsupported transform module"); return NULL; } - if (transform->grid_size <= 0) { + if (transform->grid_size <= 0 && + (transform_fn == qcms_transform_module_clut || + transform_fn == qcms_transform_module_clut_only)) { assert(0 && "Invalid transform"); return NULL; } -- cgit v1.2.3