OSDN Git Service
(root)
/
android-x86
/
external-mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c0a61c8
)
mesa: Fix memory leak if we run out of memory
author
Vinson Lee
<vlee@vmware.com>
Wed, 28 Oct 2009 23:59:49 +0000
(17:59 -0600)
committer
Brian Paul
<brianp@vmware.com>
Wed, 28 Oct 2009 23:59:49 +0000
(17:59 -0600)
Signed-off-by: Brian Paul <brianp@vmware.com>
src/mesa/main/texstore.c
patch
|
blob
|
history
diff --git
a/src/mesa/main/texstore.c
b/src/mesa/main/texstore.c
index
a22db62
..
d323795
100644
(file)
--- a/
src/mesa/main/texstore.c
+++ b/
src/mesa/main/texstore.c
@@
-589,8
+589,12
@@
_mesa_make_temp_chan_image(GLcontext *ctx, GLuint dims,
/* unpack and transfer the source image */
tempImage = (GLchan *) _mesa_malloc(srcWidth * srcHeight * srcDepth
* components * sizeof(GLchan));
- if (!tempImage)
+ if (!tempImage) {
+ if (freeSrcImage) {
+ _mesa_free((void *) srcAddr);
+ }
return NULL;
+ }
dst = tempImage;
for (img = 0; img < srcDepth; img++) {