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

Fix segfault in cmd_autoaway()

Browse Source 
Two mistakes were here:
* `/autoaway time away` without a time argument segfaulted
* `/autoaway message away` without a mesage set to (null). We have
  `/autoaway message off to set it off.

Also use g_strcmp0() instead of strcmp().
This commit is contained in:
Michael Vetter 2021-03-29 10:48:42 +02:00
parent a09d49d884
commit 3c1e4bac3a
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/command/cmd_funcs.c
View File

@ -6488,13 +6488,13 @@ cmd_ping(ProfWin* window, const char* const command, gchar** args)
gboolean gboolean
cmd_autoaway(ProfWin* window, const char* const command, gchar** args) cmd_autoaway(ProfWin* window, const char* const command, gchar** args)
{ {
if ((strcmp(args[0], "mode") != 0) && (strcmp(args[0], "time") != 0) && (strcmp(args[0], "message") != 0) && (strcmp(args[0], "check") != 0)) { if ((g_strcmp0(args[0], "mode") != 0) && (g_strcmp0(args[0], "time") != 0) && (g_strcmp0(args[0], "message") != 0) && (g_strcmp0(args[0], "check") != 0)) {
cons_show("Setting must be one of 'mode', 'time', 'message' or 'check'"); cons_show("Setting must be one of 'mode', 'time', 'message' or 'check'");
return TRUE; return TRUE;
} }
if (strcmp(args[0], "mode") == 0) { if (g_strcmp0(args[0], "mode") == 0) {
if ((strcmp(args[1], "idle") != 0) && (strcmp(args[1], "away") != 0) && (strcmp(args[1], "off") != 0)) { if ((g_strcmp0(args[1], "idle") != 0) && (g_strcmp0(args[1], "away") != 0) && (g_strcmp0(args[1], "off") != 0)) {
cons_show("Mode must be one of 'idle', 'away' or 'off'"); cons_show("Mode must be one of 'idle', 'away' or 'off'");
} else { } else {
prefs_set_string(PREF_AUTOAWAY_MODE, args[1]); prefs_set_string(PREF_AUTOAWAY_MODE, args[1]);
@ -6504,7 +6504,7 @@ cmd_autoaway(ProfWin* window, const char* const command, gchar** args)
return TRUE; return TRUE;
} }
if (strcmp(args[0], "time") == 0) { if ((g_strcmp0(args[0], "time") == 0) && (args[2] != NULL)) {
if (g_strcmp0(args[1], "away") == 0) { if (g_strcmp0(args[1], "away") == 0) {
int minutesval = 0; int minutesval = 0;
char* err_msg = NULL; char* err_msg = NULL;
@ -6550,11 +6550,14 @@ cmd_autoaway(ProfWin* window, const char* const command, gchar** args)
cons_bad_cmd_usage(command); cons_bad_cmd_usage(command);
return TRUE; return TRUE;
} }
} else {
cons_bad_cmd_usage(command);
return TRUE;
} }
if (strcmp(args[0], "message") == 0) { if (g_strcmp0(args[0], "message") == 0) {
if (g_strcmp0(args[1], "away") == 0) { if (g_strcmp0(args[1], "away") == 0 && args[2] != NULL) {
if (strcmp(args[2], "off") == 0) { if (g_strcmp0(args[2], "off") == 0) {
prefs_set_string(PREF_AUTOAWAY_MESSAGE, NULL); prefs_set_string(PREF_AUTOAWAY_MESSAGE, NULL);
cons_show("Auto away message cleared."); cons_show("Auto away message cleared.");
} else { } else {
@ -6564,7 +6567,7 @@ cmd_autoaway(ProfWin* window, const char* const command, gchar** args)
return TRUE; return TRUE;
} else if (g_strcmp0(args[1], "xa") == 0) { } else if (g_strcmp0(args[1], "xa") == 0) {
if (strcmp(args[2], "off") == 0) { if (g_strcmp0(args[2], "off") == 0) {
prefs_set_string(PREF_AUTOXA_MESSAGE, NULL); prefs_set_string(PREF_AUTOXA_MESSAGE, NULL);
cons_show("Auto xa message cleared."); cons_show("Auto xa message cleared.");
} else { } else {
@ -6579,7 +6582,7 @@ cmd_autoaway(ProfWin* window, const char* const command, gchar** args)
} }
} }
if (strcmp(args[0], "check") == 0) { if (g_strcmp0(args[0], "check") == 0) {
_cmd_set_boolean_preference(args[1], command, "Online check", PREF_AUTOAWAY_CHECK); _cmd_set_boolean_preference(args[1], command, "Online check", PREF_AUTOAWAY_CHECK);
return TRUE; return TRUE;
} }