diff options
| author | marha <marha@users.sourceforge.net> | 2014-07-01 09:29:23 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-07-01 09:29:23 +0200 |
| commit | b6fac85cb1bb78f48ed81aaf42ba6b840b2d6cad (patch) | |
| tree | 2cf97060ce44345489da6d1bcbbe568d2b2ea666 /mesalib/src/mesa/main/vdpau.c | |
| parent | ac314766fd4f60b8ee0346b7586c1a5a6f533e11 (diff) | |
| parent | cfc5bafcb2db8c6e05d7be6bb7315960be08c0d8 (diff) | |
| download | vcxsrv-b6fac85cb1bb78f48ed81aaf42ba6b840b2d6cad.tar.gz vcxsrv-b6fac85cb1bb78f48ed81aaf42ba6b840b2d6cad.tar.bz2 vcxsrv-b6fac85cb1bb78f48ed81aaf42ba6b840b2d6cad.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa pixman git update 1 July 2014
Diffstat (limited to 'mesalib/src/mesa/main/vdpau.c')
| -rw-r--r-- | mesalib/src/mesa/main/vdpau.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/mesalib/src/mesa/main/vdpau.c b/mesalib/src/mesa/main/vdpau.c index d97459393..975b812cd 100644 --- a/mesalib/src/mesa/main/vdpau.c +++ b/mesalib/src/mesa/main/vdpau.c @@ -132,6 +132,11 @@ register_surface(struct gl_context *ctx, GLboolean isOutput, } surf = CALLOC_STRUCT( vdp_surface ); + if (surf == NULL) { + _mesa_error_no_memory("VDPAURegisterSurfaceNV"); + return (GLintptr)NULL; + } + surf->vdpSurface = vdpSurface; surf->target = target; surf->access = GL_READ_WRITE; @@ -140,6 +145,12 @@ register_surface(struct gl_context *ctx, GLboolean isOutput, for (i = 0; i < numTextureNames; ++i) { struct gl_texture_object *tex; tex = _mesa_lookup_texture(ctx, textureNames[i]); + if (tex == NULL) { + free(surf); + _mesa_error(ctx, GL_INVALID_OPERATION, + "VDPAURegisterSurfaceNV(texture ID not found)"); + return (GLintptr)NULL; + } _mesa_lock_texture(ctx, tex); |