aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

refactored call_external code

Browse Source 
unluckily here the code neglected the fact that glib will set an error
to a location that was pointed by the error pointer if it is not null.
but it was of an undefined value hence profanity crashed. now it is null
as it must be.

also spawn error is returned when glib could not spawn the task for
some reason like the executable file does not exist but if the exit
status was non-zero it neglected the exit error and tried to output a
spawn error instead. now we check whether the process that we
instantiated has exited successfully

also now code uses `g_spawn_check_wait_status` which
`g_spawn_check_exit_status` has been aliased to.
This commit is contained in:
nandesu-utils 2022-08-24 23:50:24 +03:00
parent 0864bc68d7
commit 056b19eb91
1 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/common.c
View File

@ -445,9 +445,10 @@ get_mentions(gboolean whole_word, gboolean case_sensitive, const char* const mes
gboolean
call_external(gchar** argv, gchar** std_out, gchar** std_err)
{
GError *spawn_error, *status_error;
gboolean spawn_result;
gint exit_status;
GError *spawn_error = NULL;
GError *exit_error = NULL;
gboolean is_successful;
gint wait_status;
GSpawnFlags flags = G_SPAWN_SEARCH_PATH;
if (std_out == NULL)
@ -455,30 +456,34 @@ call_external(gchar** argv, gchar** std_out, gchar** std_err)
if (std_err == NULL)
flags |= G_SPAWN_STDERR_TO_DEV_NULL;
spawn_result = g_spawn_sync(NULL, // Inherit the parent PWD.
is_successful = g_spawn_sync(NULL, // Inherit the parent PWD.
argv,
NULL, // Inherit the parent environment.
flags,
NULL, NULL, // No func. before exec() in child.
std_out, std_err,
&exit_status, &spawn_error);
&wait_status, &spawn_error);
if (!spawn_result || !g_spawn_check_exit_status(exit_status, &status_error)) {
if (!is_successful) {
gchar* cmd = g_strjoinv(" ", argv);
if (spawn_error && spawn_error->message) {
log_error("Spawning '%s' failed with '%s'.", cmd, spawn_error->message);
g_error_free(spawn_error);
} else if (status_error && status_error->message) {
log_error("Spawning '%s' failed with '%s'.", cmd, status_error->message);
g_error_free(status_error);
spawn_result = FALSE;
} else {
log_error("Spawning '%s' failed with.", cmd);
}
log_error("could not spawn '%s' with error '%s'", cmd, spawn_error->message);
g_error_free(spawn_error);
g_free(cmd);
}
else {
is_successful = g_spawn_check_wait_status(wait_status, &exit_error);
return spawn_result;
if (!is_successful) {
gchar* cmd = g_strjoinv(" ", argv);
log_error("'%s' exited with error '%s'", cmd, exit_error->message);
g_error_free(exit_error);
g_free(cmd);
}
}
return is_successful;
}
gchar**