From 59f841bc20265f9440303ff9b5aa7696a4336c99 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Sat, 2 Dec 2017 16:20:34 +0000
Subject: [PATCH] Fixes for cppcheck reported issues

---
 src/osg/glu/libtess/memalloc.cpp | 11 -----------
 src/osg/glu/libtess/memalloc.h   |  6 ------
 src/osgDB/InputStream.cpp        |  7 ++++++-
 3 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/src/osg/glu/libtess/memalloc.cpp b/src/osg/glu/libtess/memalloc.cpp
index b4527ea2c..e33f289d4 100644
--- a/src/osg/glu/libtess/memalloc.cpp
+++ b/src/osg/glu/libtess/memalloc.cpp
@@ -39,17 +39,6 @@ int __gl_memInit( size_t /*maxFast*/ )
 {
 #ifndef NO_MALLOPT
 /*  mallopt( M_MXFAST, maxFast );*/
-#ifdef MEMORY_DEBUG
-  mallopt( M_DEBUG, 1 );
-#endif
 #endif
    return 1;
 }
-
-#ifdef MEMORY_DEBUG
-void *__gl_memAlloc( size_t n )
-{
-  return memset( malloc( n ), 0xa5, n );
-}
-#endif
-
diff --git a/src/osg/glu/libtess/memalloc.h b/src/osg/glu/libtess/memalloc.h
index c2f969b8b..e495a1e7c 100644
--- a/src/osg/glu/libtess/memalloc.h
+++ b/src/osg/glu/libtess/memalloc.h
@@ -41,14 +41,8 @@
 #define memFree		free
 
 #define memInit		__gl_memInit
-/*extern void		__gl_memInit( size_t );*/
 extern int		__gl_memInit( size_t );
 
-#ifndef MEMORY_DEBUG
 #define memAlloc	malloc
-#else
-#define memAlloc	__gl_memAlloc
-extern void *		__gl_memAlloc( size_t );
-#endif
 
 #endif
diff --git a/src/osgDB/InputStream.cpp b/src/osgDB/InputStream.cpp
index e1cdb734d..4b3b8c2e2 100644
--- a/src/osgDB/InputStream.cpp
+++ b/src/osgDB/InputStream.cpp
@@ -709,7 +709,12 @@ osg::ref_ptr<osg::Image> InputStream::readImage(bool readFromExternal)
                 char* data = new char[size];
                 if ( !data )
                     throwException( "InputStream::readImage() Out of memory." );
-                if ( getException() ) return NULL;
+
+                if ( getException() )
+                {
+                    delete [] data;
+                    return NULL;
+                }
 
                 readCharArray( data, size );
                 image = new osg::Image;