pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-07-09 11:13:12 +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)
src/plugins/exec/exec.c
+12 -26
View File
@@ -417,11 +417,8 @@ exec_concat_output (struct t_exec_cmd *exec_cmd, struct t_gui_buffer *buffer,
line = weechat_strndup (ptr_text, pos - ptr_text);
if (!line)
break;
if (exec_cmd->output[out])
{
free (exec_cmd->output[out]);
exec_cmd->output[out] = NULL;
}
free (exec_cmd->output[out]);
exec_cmd->output[out] = NULL;
exec_cmd->output_size[out] = 0;
exec_display_line (exec_cmd, buffer, out, line);
free (line);
@@ -471,12 +468,10 @@ exec_end_command (struct t_exec_cmd *exec_cmd, int return_code)
weechat_hashtable_set (hashtable, "name", exec_cmd->name);
output = exec_decode_color (exec_cmd, exec_cmd->output[EXEC_STDOUT]);
weechat_hashtable_set (hashtable, "out", output);
if (output)
free (output);
free (output);
output = exec_decode_color (exec_cmd, exec_cmd->output[EXEC_STDERR]);
weechat_hashtable_set (hashtable, "err", output);
if (output)
free (output);
free (output);
snprintf (str_number, sizeof (str_number), "%d", return_code);
weechat_hashtable_set (hashtable, "rc", str_number);
weechat_hook_hsignal_send (exec_cmd->hsignal, hashtable);
@@ -554,11 +549,8 @@ exec_end_command (struct t_exec_cmd *exec_cmd, int return_code)
exec_cmd->return_code = return_code;
for (i = 0; i < 2; i++)
{
if (exec_cmd->output[i])
{
free (exec_cmd->output[i]);
exec_cmd->output[i] = NULL;
}
free (exec_cmd->output[i]);
exec_cmd->output[i] = NULL;
exec_cmd->output_size[i] = 0;
}
@@ -645,21 +637,15 @@ exec_free (struct t_exec_cmd *exec_cmd)
/* free data */
if (exec_cmd->hook)
weechat_unhook (exec_cmd->hook);
if (exec_cmd->name)
free (exec_cmd->name);
if (exec_cmd->command)
free (exec_cmd->command);
if (exec_cmd->buffer_full_name)
free (exec_cmd->buffer_full_name);
free (exec_cmd->name);
free (exec_cmd->command);
free (exec_cmd->buffer_full_name);
for (i = 0; i < 2; i++)
{
if (exec_cmd->output[i])
free (exec_cmd->output[i]);
free (exec_cmd->output[i]);
}
if (exec_cmd->pipe_command)
free (exec_cmd->pipe_command);
if (exec_cmd->hsignal)
free (exec_cmd->hsignal);
free (exec_cmd->pipe_command);
free (exec_cmd->hsignal);
free (exec_cmd);