From 93145387f49114274c5def3f8da6f7559a5e6744 Mon Sep 17 00:00:00 2001 From: Daniel Richard G Date: Mon, 16 Sep 2013 16:22:14 -0400 Subject: [PATCH] Fixed uninitialized-memory errors detected by Valgrind --- groupmesh.cpp | 2 +- polygon.cpp | 8 ++++++-- toolbar.cpp | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/groupmesh.cpp b/groupmesh.cpp index d89918b..444ac13 100644 --- a/groupmesh.cpp +++ b/groupmesh.cpp @@ -61,7 +61,7 @@ void Group::GenerateLoops(void) { if(type == DRAWING_3D || type == DRAWING_WORKPLANE || type == ROTATE || type == TRANSLATE || type == IMPORTED) { - bool allClosed, allCoplanar, allNonZeroLen; + bool allClosed = false, allCoplanar = false, allNonZeroLen = false; AssembleLoops(&allClosed, &allCoplanar, &allNonZeroLen); if(!allCoplanar) { polyError.how = POLY_NOT_COPLANAR; diff --git a/polygon.cpp b/polygon.cpp index 841233a..3239a81 100644 --- a/polygon.cpp +++ b/polygon.cpp @@ -299,10 +299,14 @@ void SEdgeList::CullExtraneousEdges(void) { // that would naively be O(n). //----------------------------------------------------------------------------- SKdNodeEdges *SKdNodeEdges::Alloc(void) { - return (SKdNodeEdges *)AllocTemporary(sizeof(SKdNodeEdges)); + SKdNodeEdges *ne = (SKdNodeEdges *)AllocTemporary(sizeof(SKdNodeEdges)); + ZERO(ne); + return ne; } SEdgeLl *SEdgeLl::Alloc(void) { - return (SEdgeLl *)AllocTemporary(sizeof(SEdgeLl)); + SEdgeLl *sell = (SEdgeLl *)AllocTemporary(sizeof(SEdgeLl)); + ZERO(sell); + return sell; } SKdNodeEdges *SKdNodeEdges::From(SEdgeList *sel) { SEdgeLl *sell = NULL; diff --git a/toolbar.cpp b/toolbar.cpp index bd9529a..56e8c56 100644 --- a/toolbar.cpp +++ b/toolbar.cpp @@ -61,7 +61,7 @@ bool GraphicsWindow::ToolbarMouseMoved(int x, int y) { x += ((int)width/2); y += ((int)height/2); - int nh; + int nh = 0; bool withinToolbar = ToolbarDrawOrHitTest(x, y, false, &nh); if(!withinToolbar) nh = 0;