diff options
| author | Tapani Pälli <tapani.palli@intel.com> | 2013-02-20 13:00:08 +0200 |
|---|---|---|
| committer | Andreas Boll <andreas.boll.dev@gmail.com> | 2013-04-17 12:44:22 +0200 |
| commit | 37e0207a24837f42db1268e1725174490746045f (patch) | |
| tree | a4bb19bd9590a03d82c26c7ffd597e5a0049c082 | |
| parent | 430282cb78de2b3cf1b53ac2156de0064dff3602 (diff) | |
mesa/es: NULL check in EGLImageTargetTexture2DOES
check that pointer passed is valid and return error if not.
Note: This is a candidate for the stable branches.
Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Chad Versace <chad.versace@linux.intel.com>
(cherry picked from commit 3cdb548bfbc77522ed4e956f7457c8339182ff8c)
| -rw-r--r-- | src/mesa/main/teximage.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c index 9edd4d84ad..764ccb38b3 100644 --- a/src/mesa/main/teximage.c +++ b/src/mesa/main/teximage.c @@ -3182,6 +3182,12 @@ _mesa_EGLImageTargetTexture2DOES (GLenum target, GLeglImageOES image) return; } + if (!image) { + _mesa_error(ctx, GL_INVALID_OPERATION, + "glEGLImageTargetTexture2D(image=%p)", image); + return; + } + if (ctx->NewState & _NEW_PIXEL) _mesa_update_state(ctx); |