diff src/adplug/core/rol.cxx @ 870:028350cb60b1 trunk

[svn] - in C++, using __null/NULL is improper. 0 should be used instead. - guard against double-deletes
author nenolod
date Fri, 16 Mar 2007 21:13:22 -0700
parents cae46214b8bf
children 4709ce4e209e
line wrap: on
line diff
--- 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;