summaryrefslogtreecommitdiffstats
path: root/src/egl/drivers/dri2/platform_drm.c
diff options
context:
space:
mode:
authorCarl Worth <cworth@cworth.org>2014-09-03 14:33:18 -0700
committerCarl Worth <cworth@cworth.org>2014-09-03 18:37:02 -0700
commitecc89e4e42c0eda41de5a37d9d0614d0846e3a3e (patch)
tree642361ecaaa9dd405f4b25cf3d18273624547339 /src/egl/drivers/dri2/platform_drm.c
parentc35f14f36880eb20f5e54480444e343520e9bec5 (diff)
downloadexternal_mesa3d-ecc89e4e42c0eda41de5a37d9d0614d0846e3a3e.zip
external_mesa3d-ecc89e4e42c0eda41de5a37d9d0614d0846e3a3e.tar.gz
external_mesa3d-ecc89e4e42c0eda41de5a37d9d0614d0846e3a3e.tar.bz2
egl: Restrict multiplication in calloc arguments to use compile-time constants
As explained in the previous commit, we want to avoid the possibility of integer-multiplication overflow while allocating buffers. In these two cases, the final allocation size is the product of three values: one variable and two that are fixed constants at compile time. In this commit, we move the explicit multiplication to involve only the compile-time constants, preventing any overflow from that multiplication, (and allowing calloc to catch any potential overflow from the remainining implicit multiplication). Reviewed-by: Matt Turner <mattst88@gmail.com>
Diffstat (limited to 'src/egl/drivers/dri2/platform_drm.c')
-rw-r--r--src/egl/drivers/dri2/platform_drm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/egl/drivers/dri2/platform_drm.c b/src/egl/drivers/dri2/platform_drm.c
index e272beb..70bd7d4 100644
--- a/src/egl/drivers/dri2/platform_drm.c
+++ b/src/egl/drivers/dri2/platform_drm.c
@@ -352,7 +352,7 @@ dri2_drm_get_buffers(__DRIdrawable * driDrawable,
const unsigned int format = 32;
int i;
- attachments_with_format = calloc(count * 2, sizeof(unsigned int));
+ attachments_with_format = calloc(count, 2 * sizeof(unsigned int));
if (!attachments_with_format) {
*out_count = 0;
return NULL;