FilePrivate is responsible to delete a stream pointer instead of File.

Generally, TagLib leaves the Private classes to delete their members.

diff --git a/taglib/toolkit/tfile.cpp b/taglib/toolkit/tfile.cpp
index 897400b8cdeea897c5a84d3ac78126ffc9d53b42..aff1684d9c2d6f71abe8a57a7c9922ed93051928 100644 (file)
--- a/taglib/toolkit/tfile.cpp
+++ b/taglib/toolkit/tfile.cpp
@@ -69,20 +69,22 @@ using namespace TagLib;
 class File::FilePrivate
 {
 public:
-  FilePrivate(IOStream *stream, bool owner);
+  FilePrivate(IOStream *stream, bool owner) :
+    stream(stream),
+    streamOwner(owner),
+    valid(true) {}
+
+  ~FilePrivate()
+  {
+    if(streamOwner)
+      delete stream;
+  }
 
   IOStream *stream;
   bool streamOwner;
   bool valid;
 };
 
-File::FilePrivate::FilePrivate(IOStream *stream, bool owner) :
-  stream(stream),
-  streamOwner(owner),
-  valid(true)
-{
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // public members
 ////////////////////////////////////////////////////////////////////////////////
@@ -99,8 +101,6 @@ File::File(IOStream *stream) :
 
 File::~File()
 {
-  if(d->stream && d->streamOwner)
-    delete d->stream;
   delete d;
 }