diff options
| author | marha <marha@users.sourceforge.net> | 2011-10-27 08:37:52 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-10-27 08:37:52 +0200 |
| commit | 2a9be4af293f20fa33cc34fbc3b72e2235d91090 (patch) | |
| tree | d41608bda1d56be1aa96857dee20e988b53760a3 /mesalib/src/mesa/swrast/s_texcombine.c | |
| parent | 9d53da0fbb9ae6df9a38ad40df4f53cd28287235 (diff) | |
| parent | d662d461634660f5c0f3998b5eb7d7ed3bd5a25f (diff) | |
| download | vcxsrv-2a9be4af293f20fa33cc34fbc3b72e2235d91090.tar.gz vcxsrv-2a9be4af293f20fa33cc34fbc3b72e2235d91090.tar.bz2 vcxsrv-2a9be4af293f20fa33cc34fbc3b72e2235d91090.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/swrast/s_texcombine.c')
| -rw-r--r-- | mesalib/src/mesa/swrast/s_texcombine.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mesalib/src/mesa/swrast/s_texcombine.c b/mesalib/src/mesa/swrast/s_texcombine.c index c67c356c1..a7cbb4424 100644 --- a/mesalib/src/mesa/swrast/s_texcombine.c +++ b/mesalib/src/mesa/swrast/s_texcombine.c @@ -108,6 +108,7 @@ texture_combine( struct gl_context *ctx, GLuint unit, GLuint n, i--; } _mesa_error(ctx, GL_OUT_OF_MEMORY, "texture_combine"); + free(rgba); return; } } |