diff options
| author | Armada <jules.blok@gmail.com> | 2013-01-11 23:35:03 +0400 |
|---|---|---|
| committer | Armada <jules.blok@gmail.com> | 2013-01-12 15:26:51 +0400 |
| commit | 49115d86e116392e10c2118330ba469602d9f985 (patch) | |
| tree | 830b047254ec64a8930673f74a2607a2557c239c | |
| parent | af1ebc1fd983e8b0e13f792449b8879325d24578 (diff) | |
Fix "Wrapper object use after free".
The shorthand is being cast to CStringW by the preprocessor.
This commit fixes that by making the cast to LPCWSTR explicit.
| -rw-r--r-- | src/filters/parser/BaseSplitter/BaseSplitter.cpp | 2 | ||||
| -rw-r--r-- | src/mpc-hc/MainFrm.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/filters/parser/BaseSplitter/BaseSplitter.cpp b/src/filters/parser/BaseSplitter/BaseSplitter.cpp index e9ad126a8..84fcc8fe7 100644 --- a/src/filters/parser/BaseSplitter/BaseSplitter.cpp +++ b/src/filters/parser/BaseSplitter/BaseSplitter.cpp @@ -1286,7 +1286,7 @@ STDMETHODIMP CBaseSplitterFilter::GetCurFile(LPOLESTR* ppszFileName, AM_MEDIA_TY LPCTSTR CBaseSplitterFilter::GetPartFilename(IAsyncReader* pAsyncReader)
{
CComQIPtr<IFileHandle> pFH = pAsyncReader;
- return pFH ? pFH->GetFileName() : m_fn;
+ return pFH ? pFH->GetFileName() : (LPCWSTR)m_fn;
}
// IMediaSeeking
diff --git a/src/mpc-hc/MainFrm.cpp b/src/mpc-hc/MainFrm.cpp index 14694cd23..31e43db5c 100644 --- a/src/mpc-hc/MainFrm.cpp +++ b/src/mpc-hc/MainFrm.cpp @@ -14963,7 +14963,7 @@ LPCTSTR CMainFrame::GetDVDAudioFormatName(DVD_AudioAttributes& ATR) const return _T("SDDS");
case DVD_AudioFormat_Other:
default:
- return ResStr(IDS_MAINFRM_137);
+ return MAKEINTRESOURCE(IDS_MAINFRM_137);
}
}
|