pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-06-30 06:46:38 +02:00
Code Activity

exec: remove check of NULL pointers before calling free() (issue #865)

Browse Source
This commit is contained in:
Sébastien Helleu
2024-04-24 23:18:14 +02:00
parent f92606a317
commit 5ad977a6ed
2 changed files with 19 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/exec/exec-command.c
+7 -16
View File
@@ -334,11 +334,8 @@ exec_command_parse_options (struct t_exec_cmd_options *cmd_options,
if (i + 1 >= argc)
return 0;
i++;
if (cmd_options->pipe_command)
{
free (cmd_options->pipe_command);
cmd_options->pipe_command = NULL;
}
free (cmd_options->pipe_command);
cmd_options->pipe_command = NULL;
if (argv[i][0] == '"')
{
/* search the ending double quote */
@@ -378,11 +375,8 @@ exec_command_parse_options (struct t_exec_cmd_options *cmd_options,
if (i + 1 >= argc)
return 0;
i++;
if (cmd_options->hsignal)
{
free (cmd_options->hsignal);
cmd_options->hsignal = NULL;
}
free (cmd_options->hsignal);
cmd_options->hsignal = NULL;
cmd_options->hsignal = strdup (argv[i]);
}
else
@@ -503,8 +497,7 @@ exec_command_run (struct t_gui_buffer *buffer,
NULL, NULL, NULL);
if (!shell || !shell[0])
{
if (shell)
free (shell);
free (shell);
shell = strdup (default_shell);
}
}
@@ -642,15 +635,13 @@ exec_command_run (struct t_gui_buffer *buffer,
argv_eol[cmd_options.command_index]);
}
if (shell)
free (shell);
free (shell);
weechat_hashtable_free (process_options);
return WEECHAT_RC_OK;
error:
if (shell)
free (shell);
free (shell);
if (new_exec_cmd)
exec_free (new_exec_cmd);
if (process_options)