Mesa (9.1): intel: Add a null pointer check before dereferencing the pointer
Chad Versace
chadversary at kemper.freedesktop.org
Wed Jun 26 21:29:04 UTC 2013
Module: Mesa
Branch: 9.1
Commit: 8b6aa864eafb99e572fff34a0cac41f8d54b9640
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8b6aa864eafb99e572fff34a0cac41f8d54b9640
Author: Anuj Phogat <anuj.phogat at gmail.com>
Date: Tue Apr 16 10:34:43 2013 -0700
intel: Add a null pointer check before dereferencing the pointer
Reviewed-by: Jordan Justen <jordan.l.justen at intel.com>
Reviewed-by: Matt Turner <mattst88 at gmail.com>
(cherry picked from commit 484b89ace99cb34719ff79c6aab1658bb8f3dc79)
---
src/mesa/drivers/dri/intel/intel_screen.c | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c
index 72f8762..539b3d1 100644
--- a/src/mesa/drivers/dri/intel/intel_screen.c
+++ b/src/mesa/drivers/dri/intel/intel_screen.c
@@ -306,6 +306,9 @@ intel_create_image_from_name(__DRIscreen *screen,
int cpp;
image = intel_allocate_image(format, loaderPrivate);
+ if (image == NULL)
+ return NULL;
+
if (image->format == MESA_FORMAT_NONE)
cpp = 1;
else
@@ -399,6 +402,9 @@ intel_create_image(__DRIscreen *screen,
}
image = intel_allocate_image(format, loaderPrivate);
+ if (image == NULL)
+ return NULL;
+
cpp = _mesa_get_format_bytes(image->format);
image->region =
intel_region_alloc(intelScreen, tiling, cpp, width, height, true);
@@ -545,6 +551,9 @@ intel_from_planar(__DRIimage *parent, int plane, void *loaderPrivate)
stride = parent->strides[index];
image = intel_allocate_image(dri_format, loaderPrivate);
+ if (image == NULL)
+ return NULL;
+
if (offset + height * stride > parent->region->bo->size) {
_mesa_warning(NULL, "intel_create_sub_image: subimage out of bounds");
free(image);
More information about the mesa-commit
mailing list