Skip to content

Fix new-delete type mismatch in MSDK dispatcher #196

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NathanGray-ChurchillNavigation wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix new-delete type mismatch in MSDK dispatcher #196

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions libvpl/src/windows/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -557,7 +557,7 @@ mfxStatus MFXInitEx2(mfxVersion version,
*session = 0;

// allocate the dispatching handle and call-table
pHandle = new MFX_DISP_HANDLE(par.Version);
pHandle = new MFX_DISP_HANDLE_EX(par.Version);
}
catch (...) {
return MFX_ERR_MEMORY_ALLOC;
Expand All @@ -578,7 +578,7 @@ mfxStatus MFXInitEx2(mfxVersion version,
// unload the failed DLL
if (MFX_ERR_NONE != mfxRes) {
pHandle->Close();
delete pHandle;
delete (MFX_DISP_HANDLE_EX *)pHandle;
return MFX_ERR_UNSUPPORTED;
}
else {
Expand Down Expand Up @@ -608,7 +608,7 @@ mfxStatus MFXClose(mfxSession session) {
// can't unload library in that case.
if (MFX_ERR_UNDEFINED_BEHAVIOR != mfxRes) {
// release the handle
delete pHandle;
delete (MFX_DISP_HANDLE_EX *)pHandle;
}
}
catch (...) {
Expand Down Expand Up @@ -767,7 +767,7 @@ static mfxStatus AllocateCloneHandle(MFX_DISP_HANDLE *parentHandle, MFX_DISP_HAN

try {
// requested version matches original session
ch = new MFX_DISP_HANDLE(ph->apiVersion);
ch = new MFX_DISP_HANDLE_EX(ph->apiVersion);
}
catch (...) {
return MFX_ERR_MEMORY_ALLOC;
Expand All @@ -794,7 +794,7 @@ static mfxStatus AllocateCloneHandle(MFX_DISP_HANDLE *parentHandle, MFX_DISP_HAN
// unload the failed DLL
if (sts) {
ch->Close();
delete ch;
delete (MFX_DISP_HANDLE_EX *)ch;
return MFX_ERR_UNSUPPORTED;
}
else {
Expand Down Expand Up @@ -859,7 +859,7 @@ mfxStatus MFXCloneSession(mfxSession session, mfxSession *clone) {

if (mfxRes != MFX_ERR_NONE || cloneRT == NULL) {
// RT call failed, delete cloned session
delete cloneHandle;
delete (MFX_DISP_HANDLE_EX *)cloneHandle;
return MFX_ERR_UNSUPPORTED;
}
cloneHandle->session = cloneRT;
Expand Down