aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2025-01-03 14:57:42 -05:00
Code

Merge pull request #1740 from profanity-im/fix/1738-avatar-seg

Browse Source 
Check for error before trying to append it
This commit is contained in:
Michael Vetter 2022-08-02 14:20:34 +02:00 committed by GitHub
commit 9d094f73e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/common.c
View File

@ -445,15 +445,16 @@ get_mentions(gboolean whole_word, gboolean case_sensitive, const char* const mes
gboolean gboolean
call_external(gchar** argv, gchar** std_out, gchar** std_err) call_external(gchar** argv, gchar** std_out, gchar** std_err)
{ {
GError *spawn_error, *status_error;
gboolean spawn_result;
gint exit_status;
GSpawnFlags flags = G_SPAWN_SEARCH_PATH; GSpawnFlags flags = G_SPAWN_SEARCH_PATH;
if (std_out == NULL) if (std_out == NULL)
flags |= G_SPAWN_STDOUT_TO_DEV_NULL; flags |= G_SPAWN_STDOUT_TO_DEV_NULL;
if (std_err == NULL) if (std_err == NULL)
flags |= G_SPAWN_STDERR_TO_DEV_NULL; flags |= G_SPAWN_STDERR_TO_DEV_NULL;
gint exit_status;
gboolean spawn_result;
GError* spawn_error;
spawn_result = g_spawn_sync(NULL, // Inherit the parent PWD. spawn_result = g_spawn_sync(NULL, // Inherit the parent PWD.
argv, argv,
NULL, // Inherit the parent environment. NULL, // Inherit the parent environment.
@ -462,12 +463,19 @@ call_external(gchar** argv, gchar** std_out, gchar** std_err)
std_out, std_err, std_out, std_err,
&exit_status, &spawn_error); &exit_status, &spawn_error);
if (!spawn_result if (!spawn_result || !g_spawn_check_exit_status(exit_status, &status_error)) {
|| !g_spawn_check_exit_status(exit_status, &spawn_error)) {
gchar* cmd = g_strjoinv(" ", argv); gchar* cmd = g_strjoinv(" ", argv);
log_error("Spawning '%s' failed with '%s'.", cmd, spawn_error->message); 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);
}
g_free(cmd); g_free(cmd);
g_error_free(spawn_error);
} }
return spawn_result; return spawn_result;