Mesa (master): Revert "glu/sgi: Set freed pointer to NULL."

Vinson Lee vlee at kemper.freedesktop.org
Thu Feb 25 22:29:14 UTC 2010


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

Author: Vinson Lee <vlee at vmware.com>
Date:   Thu Feb 25 14:26:25 2010 -0800

Revert "glu/sgi: Set freed pointer to NULL."

This commit breaks flightgear fgfs. A null pointer is
dereferenced in the function MakeVertex.

This reverts commit 9be414f4b93c763e1aee8f634a13721ae5d95fcd.

---

 src/glu/sgi/libtess/mesh.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/src/glu/sgi/libtess/mesh.c b/src/glu/sgi/libtess/mesh.c
index 2e962ed..95f87cd 100644
--- a/src/glu/sgi/libtess/mesh.c
+++ b/src/glu/sgi/libtess/mesh.c
@@ -332,7 +332,6 @@ int __gl_meshSplice( GLUhalfEdge *eOrg, GLUhalfEdge *eDst )
     /* We are merging two disjoint vertices -- destroy eDst->Org */
     joiningVertices = TRUE;
     KillVertex( eDst->Org, eOrg->Org );
-    eDst->Org = NULL;
   }
   if( eDst->Lface != eOrg->Lface ) {
     /* We are connecting two disjoint loops -- destroy eDst->Lface */




More information about the mesa-commit mailing list