[med-svn] [conquest-dicom-server] 13/14: Fix mismatched new/delete in device.cpp

[Pablo Lorenzzoni]

This is an automated email from the git hooks/post-receive script.

spectra pushed a commit to branch master
in repository conquest-dicom-server.

commit 3cb6305833f6862c86a3d12a366a6f4790444b06
Author: Pablo Lorenzzoni <spectra at debian.org>
Date:   Thu Mar 6 15:44:33 2014 -0300

    Fix mismatched new/delete in device.cpp
---
 ...8-Fix-mismatched-new-delete-in-device.cpp.patch | 52 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 53 insertions(+)

diff --git a/debian/patches/0018-Fix-mismatched-new-delete-in-device.cpp.patch b/debian/patches/0018-Fix-mismatched-new-delete-in-device.cpp.patch
new file mode 100644
index 0000000..065c396
--- /dev/null
+++ b/debian/patches/0018-Fix-mismatched-new-delete-in-device.cpp.patch
@@ -0,0 +1,52 @@
+From: Pablo Lorenzzoni <spectra at debian.org>
+Date: Thu, 6 Mar 2014 15:43:54 -0300
+Subject: Fix mismatched new/delete in device.cpp
+
+---
+ device.cpp |   20 ++++++++++----------
+ 1 file changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/device.cpp b/device.cpp
+index 0d4458f..d2f7eaa 100644
+--- a/device.cpp
++++ b/device.cpp
+@@ -185,12 +185,12 @@ void FreeDeviceTables(void)
+ { int i;
+ 
+   for (i=0; i<(int)MAGDevices; i++)
+-    delete MAGDeviceTable[i];
+-  delete MAGDeviceTable;
++    delete [] MAGDeviceTable[i];
++  delete [] MAGDeviceTable;
+ 
+   for (i=0; i<(int)MIRRORDevices; i++)
+-    delete MIRRORDeviceTable[i];
+-  delete MIRRORDeviceTable;
++    delete [] MIRRORDeviceTable[i];
++  delete [] MIRRORDeviceTable;
+ 
+   for (i=0; i<(int)MOPDevices; i++)
+     delete MOPDeviceTable[i];
+@@ -201,16 +201,16 @@ void FreeDeviceTables(void)
+   delete CDRDeviceTable;
+ 
+   for (i=0; i<(int)CACHEDevices; i++)
+-    delete CACHEDeviceTable[i];
+-  delete CACHEDeviceTable;
++    delete [] CACHEDeviceTable[i];
++  delete [] CACHEDeviceTable;
+ 
+   for (i=0; i<(int)JUKEBOXDevices; i++)
+-    delete JUKEBOXDeviceTable[i];
+-  delete JUKEBOXDeviceTable;
++    delete [] JUKEBOXDeviceTable[i];
++  delete [] JUKEBOXDeviceTable;
+ 
+-  delete MAGDeviceSpace;
++  delete [] MAGDeviceSpace;
+ 
+-  delete MIRRORDeviceSpace;
++  delete [] MIRRORDeviceSpace;
+ }
+ 
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 210557d..83db0e1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,3 +15,4 @@
 0015-Fix-mismatched-new-delete-in-dbsql.cpp.patch
 0016-Fix-mismatched-new-delete-in-rtc.cxx.patch
 0017-Fix-mismatched-new-delete-in-farray.thh.patch
+0018-Fix-mismatched-new-delete-in-device.cpp.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/conquest-dicom-server.git