Mesa (master): fix possible memory leak in bezierPatchMeshMake

[Brian Paul]

Module: Mesa
Branch: master
Commit: c03af8e78069921d02cf4d9b70aabb82d5326764
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=c03af8e78069921d02cf4d9b70aabb82d5326764

Author: Daniel Zimmermann <[EMAIL PROTECTED]>
Date:   Wed Nov 26 11:48:53 2008 +0100

fix possible memory leak in bezierPatchMeshMake

---

 src/glu/sgi/libnurbs/interface/bezierPatchMesh.cc |   17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/glu/sgi/libnurbs/interface/bezierPatchMesh.cc 
b/src/glu/sgi/libnurbs/interface/bezierPatchMesh.cc
index 3dc1631..ac7ff84 100644
--- a/src/glu/sgi/libnurbs/interface/bezierPatchMesh.cc
+++ b/src/glu/sgi/libnurbs/interface/bezierPatchMesh.cc
@@ -103,23 +103,22 @@ bezierPatchMesh *bezierPatchMeshMake(int maptype, float 
umin, float umax, int us
   int dimension;
   int the_ustride;
   int the_vstride;
-  
-  bezierPatchMesh *ret = (bezierPatchMesh*) malloc(sizeof(bezierPatchMesh));
-  assert(ret);
 
-  ret->bpatch = NULL;
-  ret->bpatch_normal = NULL;
-  ret->bpatch_color  = NULL;
-  ret->bpatch_texcoord = NULL;
- 
   if(maptype == GL_MAP2_VERTEX_3) dimension = 3;
   else if (maptype==GL_MAP2_VERTEX_4) dimension = 4;
   else {
     fprintf(stderr, "error in inMap2f, maptype=%i is wrong, maptype,map is 
invalid\n", maptype);
     return NULL;
   }
-  
+
+  bezierPatchMesh *ret = (bezierPatchMesh*) malloc(sizeof(bezierPatchMesh));
+  assert(ret);
+
+  ret->bpatch_normal = NULL;
+  ret->bpatch_color  = NULL;
+  ret->bpatch_texcoord = NULL;
   ret->bpatch = bezierPatchMake(umin, vmin, umax, vmax, uorder, vorder, 
dimension);
+
   /*copy the control points there*/
   the_ustride = vorder * dimension;
   the_vstride = dimension;

_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit