summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/gallium/state_trackers/g3dvl/vl_surface.c6
-rw-r--r--src/xvmc/surface.c15
2 files changed, 13 insertions, 8 deletions
diff --git a/src/gallium/state_trackers/g3dvl/vl_surface.c b/src/gallium/state_trackers/g3dvl/vl_surface.c
index 911469f966a..612438f2ac3 100644
--- a/src/gallium/state_trackers/g3dvl/vl_surface.c
+++ b/src/gallium/state_trackers/g3dvl/vl_surface.c
@@ -51,6 +51,12 @@ int vlCreateSurface
sfc->texture = vlGetPipeScreen(screen)->texture_create(vlGetPipeScreen(screen), &template);
+ if (!sfc->texture)
+ {
+ FREE(sfc);
+ return 1;
+ }
+
*surface = sfc;
return 0;
diff --git a/src/xvmc/surface.c b/src/xvmc/surface.c
index 67c179e66d3..7c5f45bd346 100644
--- a/src/xvmc/surface.c
+++ b/src/xvmc/surface.c
@@ -73,14 +73,13 @@ Status XvMCCreateSurface(Display *display, XvMCContext *context, XvMCSurface *su
assert(display == vlGetNativeDisplay(vlGetDisplay(vlContextGetScreen(vl_ctx))));
- vlCreateSurface
- (
- vlContextGetScreen(vl_ctx),
- context->width,
- context->height,
- vlGetPictureFormat(vl_ctx),
- &vl_sfc
- );
+ if (vlCreateSurface(vlContextGetScreen(vl_ctx),
+ context->width, context->height,
+ vlGetPictureFormat(vl_ctx),
+ &vl_sfc))
+ {
+ return BadAlloc;
+ }
vlBindToContext(vl_sfc, vl_ctx);