# HG changeset patch
# User nenolod
# Date 1174104802 25200
# Node ID 028350cb60b1120688fd80816939e8abc6c845a9
# Parent  48ebfc711a8cf9237c9dfe9e10d4266b188fadc8
[svn] - in C++, using __null/NULL is improper. 0 should be used instead.
- guard against double-deletes

diff -r 48ebfc711a8c -r 028350cb60b1 ChangeLog
--- a/ChangeLog	Fri Mar 16 21:08:34 2007 -0700
+++ b/ChangeLog	Fri Mar 16 21:13:22 2007 -0700
@@ -1,3 +1,17 @@
+2007-03-17 04:08:34 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
+  revision [1838]
+  - guard some potentially improper double delete [] usage
+  
+  trunk/src/adplug/core/a2m.cxx     |   18 ++++++++++++------
+  trunk/src/adplug/core/adl.cxx     |    4 ++--
+  trunk/src/adplug/core/sng.h       |    4 ++--
+  trunk/src/adplug/core/temuopl.cxx |    2 +-
+  trunk/src/adplug/core/u6m.cxx     |    4 ++--
+  trunk/src/adplug/core/xad.cxx     |    3 +--
+  trunk/src/adplug/core/xsm.cxx     |    2 +-
+  7 files changed, 21 insertions(+), 16 deletions(-)
+
+
 2007-03-17 01:58:17 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
   revision [1836]
   - fix double delete[] possibility.
diff -r 48ebfc711a8c -r 028350cb60b1 src/adplug/core/rol.cxx
--- a/src/adplug/core/rol.cxx	Fri Mar 16 21:08:34 2007 -0700
+++ b/src/adplug/core/rol.cxx	Fri Mar 16 21:13:22 2007 -0700
@@ -84,10 +84,10 @@
 //---------------------------------------------------------
 CrolPlayer::~CrolPlayer()
 {
-    if( rol_header != NULL )
+    if(rol_header)
     {
         delete rol_header;
-        rol_header=NULL;
+        rol_header = 0;
     }
 }
 //---------------------------------------------------------
@@ -107,7 +107,7 @@
 	break;
     strcpy(fn+i+1,"standard.bnk");
     bnk_filename = fn;
-    delete [] fn;
+    delete [] fn; fn = 0;
     AdPlug_LogWrite("bnk_filename = \"%s\"\n",bnk_filename.c_str());
 
     rol_header = new SRolHeader;