OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i965: check pointer before dereferencing it

Browse Source 
Check that irb isn't NULL before accessing irb->Base.Base.NumSamples.

CID: 1026046
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
This commit is contained in:
Lionel Landwerlin
2017-07-13 16:11:40 +01:00
parent b02d136b5e
commit fd8e8fdbfe
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/mesa/drivers/dri/i965/intel_tex_copy.c
View File

@@ -52,6 +52,13 @@ intel_copy_texsubimage(struct brw_context *brw,
{ {
const GLenum internalFormat = intelImage->base.Base.InternalFormat; const GLenum internalFormat = intelImage->base.Base.InternalFormat;
if (!intelImage->mt || !irb || !irb->mt) {
if (unlikely(INTEL_DEBUG & DEBUG_PERF))
fprintf(stderr, "%s fail %p %p (0x%08x)\n",
__func__, intelImage->mt, irb, internalFormat);
return false;
}
/* No pixel transfer operations (zoom, bias, mapping), just a blit */ /* No pixel transfer operations (zoom, bias, mapping), just a blit */
if (brw->ctx._ImageTransferState) if (brw->ctx._ImageTransferState)
return false; return false;
@@ -69,13 +76,6 @@ intel_copy_texsubimage(struct brw_context *brw,
/* glCopyTexSubImage() can't be called on a multisampled texture. */ /* glCopyTexSubImage() can't be called on a multisampled texture. */
assert(intelImage->base.Base.NumSamples == 0); assert(intelImage->base.Base.NumSamples == 0);
if (!intelImage->mt || !irb || !irb->mt) {
if (unlikely(INTEL_DEBUG & DEBUG_PERF))
fprintf(stderr, "%s fail %p %p (0x%08x)\n",
__func__, intelImage->mt, irb, internalFormat);
return false;
}
/* account for view parameters and face index */ /* account for view parameters and face index */
int dst_level = intelImage->base.Base.Level + int dst_level = intelImage->base.Base.Level +
intelImage->base.Base.TexObject->MinLevel; intelImage->base.Base.TexObject->MinLevel;