mirrors/FreeRDP
0
0
Fork 0
mirror of https://github.com/FreeRDP/FreeRDP.git synced 2024-11-27 03:44:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

[warnings] fix mismatched-dealloc

Browse Source 
Some allocator functions have an error path where the corresponding free
function is called. Since the memory in the allocator function was
allocated using malloc/calloc the free function does not match. Silence
warnings with pragma macros
This commit is contained in:
Armin Novak 2024-09-18 15:26:31 +02:00
parent c16e5ffcc2
commit c7c84682e1
No known key found for this signature in database
GPG Key ID: 2CF4A2D2D3D72105
4 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libfreerdp/codec/dsp_ffmpeg.c
View File

@ -656,7 +656,10 @@ FREERDP_DSP_CONTEXT* freerdp_dsp_ffmpeg_context_new(BOOL encode)
return context;
fail:
WINPR_PRAGMA_DIAG_PUSH
WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC
freerdp_dsp_ffmpeg_context_free(context);
WINPR_PRAGMA_DIAG_POP
return NULL;
}

3
libfreerdp/common/settings.c
View File

@ -804,7 +804,10 @@ ADDIN_ARGV* freerdp_addin_argv_new(size_t argc, const char* argv[])
return args;
fail:
WINPR_PRAGMA_DIAG_PUSH
WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC
freerdp_addin_argv_free(args);
WINPR_PRAGMA_DIAG_POP
return NULL;
}

6
libfreerdp/core/settings.c
View File

@ -833,7 +833,10 @@ rdpSettings* freerdp_settings_new(DWORD flags)
return settings;
out_fail:
WINPR_PRAGMA_DIAG_PUSH
WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC
freerdp_settings_free(settings);
WINPR_PRAGMA_DIAG_POP
return NULL;
}
@ -1164,7 +1167,10 @@ rdpSettings* freerdp_settings_clone(const rdpSettings* settings)
return _settings;
out_fail:
WINPR_PRAGMA_DIAG_PUSH
WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC
freerdp_settings_free(_settings);
WINPR_PRAGMA_DIAG_POP
return NULL;
}
#ifdef _MSC_VER

7
server/proxy/pf_config.c
View File

@ -582,7 +582,11 @@ proxyConfig* server_config_load_ini(wIniFile* ini)
}
return config;
out:
WINPR_PRAGMA_DIAG_PUSH
WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC
pf_server_config_free(config);
WINPR_PRAGMA_DIAG_POP
return NULL;
}
@ -989,7 +993,10 @@ BOOL pf_config_clone(proxyConfig** dst, const proxyConfig* config)
return TRUE;
fail:
WINPR_PRAGMA_DIAG_PUSH
WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC
pf_server_config_free(tmp);
WINPR_PRAGMA_DIAG_POP
return FALSE;
}