From 986f9e50ded299802fc0ad63e5643f6df62c31ec Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Fri, 21 Jul 2017 14:42:06 +0200 Subject: [PATCH] mesa: return GL_OUT_OF_MEMORY if NewSamplerObject fails This is similar to other functions that create objects. Signed-off-by: Samuel Pitoiset Reviewed-by: Timothy Arceri --- src/mesa/main/samplerobj.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/mesa/main/samplerobj.c b/src/mesa/main/samplerobj.c index 326eceb1aa2..74464410862 100644 --- a/src/mesa/main/samplerobj.c +++ b/src/mesa/main/samplerobj.c @@ -169,10 +169,18 @@ create_samplers(struct gl_context *ctx, GLsizei count, GLuint *samplers, /* Insert the ID and pointer to new sampler object into hash table */ for (i = 0; i < count; i++) { - struct gl_sampler_object *sampObj = - ctx->Driver.NewSamplerObject(ctx, first + i); - _mesa_HashInsertLocked(ctx->Shared->SamplerObjects, first + i, sampObj); - samplers[i] = first + i; + struct gl_sampler_object *sampObj; + GLuint name = first + i; + + sampObj = ctx->Driver.NewSamplerObject(ctx, name); + if (!sampObj) { + _mesa_HashUnlockMutex(ctx->Shared->SamplerObjects); + _mesa_error(ctx, GL_OUT_OF_MEMORY, "%s", caller); + return; + } + + _mesa_HashInsertLocked(ctx->Shared->SamplerObjects, name, sampObj); + samplers[i] = name; } _mesa_HashUnlockMutex(ctx->Shared->SamplerObjects); -- 2.30.2