mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10637 from akallabeth/dealloc-fix

Browse Source 
[warnings] fix mismatched-dealloc
This commit is contained in:
akallabeth 2024-09-20 10:50:20 +02:00 committed by GitHub
commit f86f70a022
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
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; return context;
fail: fail:
WINPR_PRAGMA_DIAG_PUSH
WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC
freerdp_dsp_ffmpeg_context_free(context); freerdp_dsp_ffmpeg_context_free(context);
WINPR_PRAGMA_DIAG_POP
return NULL; 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; return args;
fail: fail:
WINPR_PRAGMA_DIAG_PUSH
WINPR_PRAGMA_DIAG_IGNORED_MISMATCHED_DEALLOC
freerdp_addin_argv_free(args); freerdp_addin_argv_free(args);
WINPR_PRAGMA_DIAG_POP
return NULL; return NULL;
} }

6
libfreerdp/core/settings.c
View File

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

7
server/proxy/pf_config.c
View File

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