do not access Data directly

git-svn-id: https://matroska.svn.sourceforge.net/svnroot/matroska/trunk/libmatroska@64 a6f86f6d-0131-4f8e-9e7b-e335508773d5

diff --git a/matroska/KaxBlock.h b/matroska/KaxBlock.h
index 9fc092dcec6de10d3db78a1776b3246453d8557b..d0f56c33d10d4f6809c5ccbdc9c61115f4465aaf 100644 (file)
--- a/matroska/KaxBlock.h
+++ b/matroska/KaxBlock.h
@@ -355,7 +355,7 @@ class MATROSKA_DLL_API KaxBlockVirtual : public EbmlBinary {
        public:
                KaxBlockVirtual() :ParentCluster(NULL) {SetBuffer(DataBlock,sizeof(DataBlock)); SetValueIsSet(false);}
                KaxBlockVirtual(const KaxBlockVirtual & ElementToClone);
-               ~KaxBlockVirtual() { if( Data == DataBlock ) SetBuffer( NULL, 0 ); };
+               ~KaxBlockVirtual();
                bool ValidateSize() const {return true;}
 
                /*!

diff --git a/src/KaxBlock.cpp b/src/KaxBlock.cpp
index 296521872a2f63c256126db55ac0715ffb9e6ecc..08d615b6576e4f14b96deb1c6a1fd99d57b2353a 100644 (file)
--- a/src/KaxBlock.cpp
+++ b/src/KaxBlock.cpp
@@ -303,6 +303,12 @@ KaxBlockVirtual::KaxBlockVirtual(const KaxBlockVirtual & ElementToClone)
     SetValueIsSet(false);\r
 }\r
 \r
+KaxBlockVirtual::~KaxBlockVirtual()\r
+{\r
+    if(GetBuffer() == DataBlock)\r
+        SetBuffer( NULL, 0 ); \r
+}\r
+\r
 filepos_t KaxBlockVirtual::UpdateSize(bool bSaveDefault, bool bForceRender)\r
 {\r
        assert(TrackNumber < 0x4000);\r