From b81751642e88beebaeaf5946320a342eadabee11 Mon Sep 17 00:00:00 2001
From: Hwasoo Lee <hwasoolee@google.com>
Date: Thu, 6 Jan 2011 16:35:41 -0500
Subject: [PATCH] initialized members using initialize list of EBMLHeader

Change-Id: I5bb46132141d7381dd23e0a3b87a3b6c0e8b7f4b
---
 mkvparser.cpp | 29 +++++++++++++++++++++--------
 mkvparser.hpp |  1 +
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/mkvparser.cpp b/mkvparser.cpp
index c8cebab..9740121 100644
--- a/mkvparser.cpp
+++ b/mkvparser.cpp
@@ -592,9 +592,10 @@ bool mkvparser::Match(
 namespace mkvparser
 {
 
-EBMLHeader::EBMLHeader():
+EBMLHeader::EBMLHeader() :
     m_docType(NULL)
 {
+    Init();
 }
 
 EBMLHeader::~EBMLHeader()
@@ -602,6 +603,23 @@ EBMLHeader::~EBMLHeader()
     delete[] m_docType;
 }
 
+void EBMLHeader::Init()
+{
+    m_version = 1;
+    m_readVersion = 1;
+    m_maxIdLength = 4;
+    m_maxSizeLength = 8;
+
+    if (m_docType)
+    {
+        delete[] m_docType;
+        m_docType = NULL;
+    }
+
+    m_docTypeVersion = 1;
+    m_docTypeReadVersion = 1;
+}
+
 long long EBMLHeader::Parse(
     IMkvReader* pReader,
     long long& pos)
@@ -700,13 +718,8 @@ long long EBMLHeader::Parse(
         return pos + result;
 
     end = pos + result;
-
-    m_version = 1;
-    m_readVersion = 1;
-    m_maxIdLength = 4;
-    m_maxSizeLength = 8;
-    m_docTypeVersion = 1;
-    m_docTypeReadVersion = 1;
+    
+    Init();
 
     while (pos < end)
     {
diff --git a/mkvparser.hpp b/mkvparser.hpp
index 106be78..a73a00a 100644
--- a/mkvparser.hpp
+++ b/mkvparser.hpp
@@ -56,6 +56,7 @@ struct EBMLHeader
     long long m_docTypeReadVersion;
 
     long long Parse(IMkvReader*, long long&);
+    void Init();
 };