From 5685dd078f8f84ff7f2cafe59a0141966aab2f5c Mon Sep 17 00:00:00 2001
From: =?utf8?q?Luk=C3=A1=C5=A1=20Lalinsk=C3=BD?= <lalinsky@gmail.com>
Date: Fri, 11 Mar 2011 10:29:27 +0100
Subject: [PATCH] Fix memory leaks in the FLAC parsing code

Thanks to Daniel Schaack for reporting these.
---
 taglib/flac/flacfile.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/taglib/flac/flacfile.cpp b/taglib/flac/flacfile.cpp
index 6a57f863..c8cc1fb8 100644
--- a/taglib/flac/flacfile.cpp
+++ b/taglib/flac/flacfile.cpp
@@ -65,13 +65,13 @@ public:
     hasID3v2(false),
     hasID3v1(false)
   {
-    for(uint i = 0; i < blocks.size(); i++) {
-      delete blocks[i];
-    }
   }
 
   ~FilePrivate()
   {
+    for(uint i = 0; i < blocks.size(); i++) {
+      delete blocks[i];
+    }
     delete properties;
   }
 
@@ -403,6 +403,7 @@ void FLAC::File::scan()
       }
       else {
         debug("FLAC::File::scan() -- invalid picture found, discarting");
+        delete picture;
       }
     }
 
@@ -412,6 +413,9 @@ void FLAC::File::scan()
     if(block->code() != MetadataBlock::Padding) {
       d->blocks.append(block);
     }
+    else {
+      delete block;
+    }
 
     nextBlockOffset += length + 4;
 
-- 
2.40.0