Fix potential undefined behavior using MediaInfo

Patch by jackieku

git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@1727 10f7b99b-c216-0410-bff0-8a66a9350fd8

3 files changed, 9 insertions, 7 deletions

diff --git a/src/apps/mplayerc/PPageFileInfoSheet.cpp b/src/apps/mplayerc/PPageFileInfoSheet.cpp
index ef4c3436e..b866948e0 100644
--- a/src/apps/mplayerc/PPageFileInfoSheet.cpp
+++ b/src/apps/mplayerc/PPageFileInfoSheet.cpp
@@ -26,9 +26,6 @@
 #include "MainFrm.h"

 #include "PPageFileInfoSheet.h"

 

-#include <MediaInfoDLL.h>

-using namespace MediaInfoDLL;

-

 // CPPageFileInfoSheet

 

 IMPLEMENT_DYNAMIC(CPPageFileInfoSheet, CPropertySheet)

@@ -54,10 +51,8 @@ CPPageFileInfoSheet::CPPageFileInfoSheet(CString fn, CMainFrame* pMainFrame, CWn
 	}

 	EndEnumFilters

 

-	MediaInfo MI;

-	CString mi_text = MI.Option(_T("Info_Version"), _T("")).c_str();

-	MI.Close();

-	if(mi_text.Find(_T("Unable to load"))<0) AddPage(&m_mi);

+	if (CPPageFileMediaInfo::HasMediaInfo())

+		AddPage(&m_mi);

 }

 

 CPPageFileInfoSheet::~CPPageFileInfoSheet()

diff --git a/src/apps/mplayerc/PPageFileMediaInfo.cpp b/src/apps/mplayerc/PPageFileMediaInfo.cpp
index 9e62bacd0..4ec69f65f 100644
--- a/src/apps/mplayerc/PPageFileMediaInfo.cpp
+++ b/src/apps/mplayerc/PPageFileMediaInfo.cpp
@@ -94,3 +94,9 @@ void CPPageFileMediaInfo::OnShowWindow(BOOL bShow, UINT nStatus)
 	else

 		GetParent()->GetDlgItem(IDC_BUTTON_MI)->ShowWindow(SW_HIDE);

 }

+

+bool CPPageFileMediaInfo::HasMediaInfo()

+{

+	MediaInfo MI;

+	return MI.IsReady();

+}

diff --git a/src/apps/mplayerc/PPageFileMediaInfo.h b/src/apps/mplayerc/PPageFileMediaInfo.h
index 319e505f7..864e578e5 100644
--- a/src/apps/mplayerc/PPageFileMediaInfo.h
+++ b/src/apps/mplayerc/PPageFileMediaInfo.h
@@ -42,6 +42,7 @@ public:
 

 	CString MI_Text;

 

+	static bool HasMediaInfo();

 protected:

 	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support

 	virtual BOOL OnInitDialog();