From 78157d7634c0a75ceac4b614d3ca5b1763c6604a Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Mon, 5 Mar 2012 09:36:40 +0000
Subject: WaE: calling delete on the wrong thing

---
 hwpfilter/source/hbox.cxx | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

(limited to 'hwpfilter')

diff --git a/hwpfilter/source/hbox.cxx b/hwpfilter/source/hbox.cxx
index 3f9ea3df1f7f..df334ac94bad 100644
--- a/hwpfilter/source/hbox.cxx
+++ b/hwpfilter/source/hbox.cxx
@@ -338,12 +338,18 @@ TxtBox::~TxtBox(void)
     {
         std::list < HWPPara* >::iterator it = plists[ii].begin();
         for (; it != plists[ii].end(); ++it)
-            delete &it;
+        {
+            HWPPara* pPara = *it;
+            delete pPara;
+        }
     }
 
     std::list < HWPPara* >::iterator it = caption.begin();
     for (; it != caption.end(); ++it)
-        delete &it;
+    {
+        HWPPara* pPara = *it;
+        delete pPara;
+    }
 
     delete[]plists;
 }
@@ -372,7 +378,10 @@ Picture::~Picture(void)
 
     std::list < HWPPara* >::iterator it = caption.begin();
     for (; it != caption.end(); ++it)
-        delete &it;
+    {
+        HWPPara* pPara = *it;
+        delete pPara;
+    }
 }
 
 
@@ -394,7 +403,10 @@ Hidden::~Hidden(void)
 {
     std::list < HWPPara* >::iterator it = plist.begin();
     for (; it != plist.end(); ++it)
-        delete &it;
+    {
+        HWPPara* pPara = *it;
+        delete pPara;
+    }
 }
 
 
@@ -403,7 +415,10 @@ HeaderFooter::~HeaderFooter(void)
 {
     std::list < HWPPara* >::iterator it = plist.begin();
     for (; it != plist.end(); ++it)
-        delete &it;
+    {
+        HWPPara* pPara = *it;
+        delete pPara;
+    }
 }
 
 
@@ -412,7 +427,10 @@ Footnote::~Footnote(void)
 {
     std::list < HWPPara* >::iterator it = plist.begin();
     for (; it != plist.end(); ++it)
-        delete &it;
+    {
+        HWPPara* pPara = *it;
+        delete pPara;
+    }
 }
 
 
-- 
cgit