From: Vinson Lee <vlee@vmware.com>
Date: Thu, 25 Feb 2010 22:26:25 +0000 (-0800)
Subject: Revert "glu/sgi: Set freed pointer to NULL."
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0bca812dc43c056c76fce8136f287f9de3c38975;p=mesa.git

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.
---

diff --git a/src/glu/sgi/libtess/mesh.c b/src/glu/sgi/libtess/mesh.c
index 2e962ed4375..95f87cdc949 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 */