mirrors/SDL
0
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2024-12-04 01:03:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed memory leaks if OpenVR initialization fails

Browse Source
This commit is contained in:
Sam Lantinga 2024-10-21 14:59:18 -07:00
parent 7b492553c4
commit d199586683
1 changed files with 93 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/video/openvr/SDL_openvrvideo.c
View File

@ -271,7 +271,6 @@ static bool OPENVR_VideoInit(SDL_VideoDevice *_this)
{
SDL_VideoData *data = (SDL_VideoData *)_this->internal;
{
const char * hintWidth = SDL_GetHint("SDL_DEFAULT_WIDTH");
const char * hintHeight = SDL_GetHint("SDL_DEFAULT_HEIGHT");
const char * hintFPS = SDL_GetHint("SDL_DEFAULT_FPS");
@ -287,7 +286,6 @@ static bool OPENVR_VideoInit(SDL_VideoDevice *_this)
} else {
openvr_vd_default.desktop_mode.refresh_rate = data->oSystem->GetFloatTrackedDeviceProperty(k_unTrackedDeviceIndex_Hmd, ETrackedDeviceProperty_Prop_DisplayFrequency_Float, 0);
}
}
openvr_vd_default.internal = (SDL_DisplayData *)data;
openvr_vd_default.name = (char*)"OpenVRDisplay";
@ -306,7 +304,19 @@ static void OPENVR_VideoQuit(SDL_VideoDevice *_this)
static void OPENVR_Destroy(SDL_VideoDevice *device)
{
// Don't need to destroy and free internal, since it is already done in SDL_VideoQuit
SDL_VideoData *data = device->internal;
#ifdef SDL_PLATFORM_WINDOWS
SDL_UnregisterApp();
#endif
if (data) {
if (data->openVRLIB) {
SDL_UnloadObject(data->openVRLIB);
}
}
SDL_free(device->internal);
SDL_free(device);
}
static uint32_t *ImageSDLToOpenVRGL(SDL_Surface * surf, bool bFlipY)
@ -1552,10 +1562,13 @@ static SDL_VideoDevice *OPENVR_CreateDevice(void)
data = NULL;
}
if (!data) {
#ifdef SDL_PLATFORM_WINDOWS
SDL_UnregisterApp();
#endif
SDL_free(device);
SDL_OutOfMemory();
return NULL;
}
device->internal = data;
{
const char * hint = SDL_GetHint(SDL_HINT_OPENVR_LIBRARY);
@ -1570,16 +1583,18 @@ static SDL_VideoDevice *OPENVR_CreateDevice(void)
#endif
}
if (data->openVRLIB) {
if (!data->openVRLIB) {
SDL_SetError("Could not open OpenVR API Library");
goto error;
}
data->FN_VR_InitInternal = (intptr_t(*)(EVRInitError * peError, EVRApplicationType eType))SDL_LoadFunction(data->openVRLIB, "VR_InitInternal");
data->FN_VR_GetVRInitErrorAsEnglishDescription = (const char *(*)(EVRInitError error))SDL_LoadFunction(data->openVRLIB, "VR_GetVRInitErrorAsEnglishDescription");
data->FN_VR_GetGenericInterface = (intptr_t (*)(const char *pchInterfaceVersion, EVRInitError * peError))SDL_LoadFunction(data->openVRLIB, "VR_GetGenericInterface");
} else {
SDL_SetError("Could not open OpenVR API Library");
return NULL;
if (!data->FN_VR_InitInternal || !data->FN_VR_GetVRInitErrorAsEnglishDescription || !data->FN_VR_GetGenericInterface) {
goto error;
}
if (data->FN_VR_InitInternal) {
char fnname[128];
EVRInitError e;
data->vrtoken = data->FN_VR_InitInternal(&e, EVRApplicationType_VRApplication_Overlay);
@ -1588,7 +1603,7 @@ static SDL_VideoDevice *OPENVR_CreateDevice(void)
if (data->FN_VR_GetVRInitErrorAsEnglishDescription != NULL)
err = data->FN_VR_GetVRInitErrorAsEnglishDescription(e);
SDL_SetError("Could not generate OpenVR Context (%s)", err);
return NULL;
goto error;
}
SDL_snprintf(fnname, 127, "FnTable:%s", IVRSystem_Version);
@ -1598,14 +1613,12 @@ static SDL_VideoDevice *OPENVR_CreateDevice(void)
SDL_snprintf(fnname, 127, "FnTable:%s", IVRInput_Version);
data->oInput = (struct VR_IVRInput_FnTable *)data->FN_VR_GetGenericInterface(fnname, &e);
if (!data->oOverlay || !data->oSystem) {
if (!data->oOverlay || !data->oSystem || !data->oInput) {
SDL_SetError("Could not get interfaces for the OpenVR System (%s), Overlay (%s) and Input (%s) versions", IVRSystem_Version, IVROverlay_Version, IVRInput_Version);
}
}
{
const char * hint = SDL_GetHint("SDL_OPENVR_INPUT_PROFILE");
char * loadpath = 0;
const char *hint = SDL_GetHint("SDL_OPENVR_INPUT_PROFILE");
char *loadpath = 0;
EVRInputError err;
if (hint) {
@ -1614,15 +1627,14 @@ static SDL_VideoDevice *OPENVR_CreateDevice(void)
const char *basepath = SDL_GetBasePath();
SDL_asprintf(&loadpath, "%ssdloverlay_actions.json", basepath);
}
if (!loadpath) {
return NULL;
goto error;
}
err = data->oInput->SetActionManifestPath(loadpath);
#ifdef DEBUG_OPENVR
#ifdef DEBUG_OPENVR
SDL_Log("Loaded action manifest at %s (%d)", loadpath, err);
#endif
#endif
SDL_free(loadpath);
if (err != EVRInputError_VRInputError_None) {
// I know we don't normally log, but this _really_ should be percolated
@ -1631,20 +1643,14 @@ static SDL_VideoDevice *OPENVR_CreateDevice(void)
// If we didn't have a hint, this is a soft fail.
// If we did have the hint, then it's a hard fail.
if (hint) {
return NULL;
goto error;
}
}
else
{
} else {
int e = OPENVR_SetupJoystckBasedOnLoadedActionManifest(data);
if(e) {
return NULL;
goto error;
}
}
}
device->internal = data;
device->wakeup_lock = SDL_CreateMutex();
// Setup amount of available displays
device->num_displays = 0;
@ -1722,6 +1728,10 @@ static SDL_VideoDevice *OPENVR_CreateDevice(void)
device->SetWindowIcon = OPENVR_SetWindowIcon;
return device;
error:
OPENVR_Destroy(device);
return NULL;
}
VideoBootStrap OPENVR_bootstrap = {