morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-14 00:14:11 +09:00
Code Issues Packages Projects Releases Wiki Activity

[channels,rdpecam] fix return checks

Browse Source
This commit is contained in:
Armin Novak
2026-03-03 12:45:17 +01:00
parent 1fb02134e6
commit 2b8ecce7a9
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
channels/rdpecam/client/camera_device_enum_main.c
View File

@@ -352,7 +352,12 @@ static UINT ecam_plugin_initialize(IWTSPlugin* pPlugin, IWTSVirtualChannelManage
return CHANNEL_RC_NO_MEMORY;
}
HashTable_SetupForStringData(ecam->devices, FALSE);
if (!HashTable_SetupForStringData(ecam->devices, FALSE))
{
HashTable_Free(ecam->devices);
ecam->devices = nullptr;
return ERROR_INTERNAL_ERROR;
}
wObject* obj = HashTable_ValueObject(ecam->devices);
WINPR_ASSERT(obj);

11
channels/rdpecam/client/v4l/camera_v4l.c
View File

@@ -791,7 +791,7 @@ static CAM_ERROR_CODE cam_v4l_free(ICamHal* ihal)
FREERDP_ENTRY_POINT(UINT VCAPITYPE v4l_freerdp_rdpecam_client_subsystem_entry(
PFREERDP_CAMERA_HAL_ENTRY_POINTS pEntryPoints))
{
UINT ret = CHANNEL_RC_OK;
UINT ret = ERROR_INTERNAL_ERROR;
WINPR_ASSERT(pEntryPoints);
CamV4lHal* hal = (CamV4lHal*)calloc(1, sizeof(CamV4lHal));
@@ -809,18 +809,17 @@ FREERDP_ENTRY_POINT(UINT VCAPITYPE v4l_freerdp_rdpecam_client_subsystem_entry(
hal->streams = HashTable_New(FALSE);
if (!hal->streams)
{
ret = CHANNEL_RC_NO_MEMORY;
goto error;
}
HashTable_SetupForStringData(hal->streams, FALSE);
if (!HashTable_SetupForStringData(hal->streams, FALSE))
goto error;
wObject* obj = HashTable_ValueObject(hal->streams);
WINPR_ASSERT(obj);
obj->fnObjectFree = cam_v4l_stream_free;
if ((ret = pEntryPoints->pRegisterCameraHal(pEntryPoints->plugin, &hal->iHal)))
ret = pEntryPoints->pRegisterCameraHal(pEntryPoints->plugin, &hal->iHal);
if (ret != CHANNEL_RC_OK)
{
WLog_ERR(TAG, "RegisterCameraHal failed with error %" PRIu32 "", ret);
goto error;