aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-11-03 04:27:19 -05:00
Code

Reject obviously invalid numbers in /set.

Browse Source 
A limitation of the settings model is that any value
that fits in an int is accepted, e.g. negative port
numbers.


git-svn-id: file:///var/www/svn.irssi.org/SVN/irssi/trunk@5017 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Jilles Tjoelker 2009-02-21 17:20:13 +00:00 committed by jilles
parent 4ea8f3141e
commit 115a7fc355
3 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/fe-common/core/fe-settings.c
View File

@ -76,6 +76,23 @@ static void set_boolean(const char *key, const char *value)
printformat(NULL, NULL, MSGLEVEL_CLIENTCRAP, TXT_NOT_TOGGLE); printformat(NULL, NULL, MSGLEVEL_CLIENTCRAP, TXT_NOT_TOGGLE);
} }
static void set_int(const char *key, const char *value)
{
char *endp;
long longval;
int error;
errno = 0;
longval = strtol(value, &endp, 10);
error = errno;
while (isspace((unsigned char)*endp))
endp++;
if (error != 0 || *endp != '\0' || longval < INT_MIN || longval > INT_MAX)
printformat(NULL, NULL, MSGLEVEL_CLIENTERROR, TXT_INVALID_NUMBER);
else
settings_set_int(key, (int)longval);
}
/* SYNTAX: SET [-clear | -default] [<key> [<value>]] */ /* SYNTAX: SET [-clear | -default] [<key> [<value>]] */
static void cmd_set(char *data) static void cmd_set(char *data)
{ {
@ -111,9 +128,12 @@ static void cmd_set(char *data)
set_boolean(key, value); set_boolean(key, value);
break; break;
case SETTING_TYPE_INT: case SETTING_TYPE_INT:
settings_set_int(key, clear ? 0 : if (clear)
set_default ? rec->default_value.v_int : settings_set_int(key, 0);
atoi(value)); else if (set_default)
settings_set_int(key, rec->default_value.v_int);
else
set_int(key, value);
break; break;
case SETTING_TYPE_STRING: case SETTING_TYPE_STRING:
settings_set_str(key, clear ? "" : settings_set_str(key, clear ? "" :

1
src/fe-common/core/module-formats.c
View File

@ -215,6 +215,7 @@ FORMAT_REC fecommon_core_formats[] = {
{ "chan_not_synced", "Channel not fully synchronized yet, try again after a while", 0 }, { "chan_not_synced", "Channel not fully synchronized yet, try again after a while", 0 },
{ "illegal_proto", "Command isn't designed for the chat protocol of the active server", 0 }, { "illegal_proto", "Command isn't designed for the chat protocol of the active server", 0 },
{ "not_good_idea", "Doing this is not a good idea. Add -YES option to command if you really mean it", 0 }, { "not_good_idea", "Doing this is not a good idea. Add -YES option to command if you really mean it", 0 },
{ "invalid_number", "Invalid number", 0 },
{ "invalid_time", "Invalid timestamp", 0 }, { "invalid_time", "Invalid timestamp", 0 },
{ "invalid_level", "Invalid message level", 0 }, { "invalid_level", "Invalid message level", 0 },
{ "invalid_size", "Invalid size", 0 }, { "invalid_size", "Invalid size", 0 },

1
src/fe-common/core/module-formats.h
View File

@ -184,6 +184,7 @@ enum {
TXT_CHAN_NOT_SYNCED, TXT_CHAN_NOT_SYNCED,
TXT_ILLEGAL_PROTO, TXT_ILLEGAL_PROTO,
TXT_NOT_GOOD_IDEA, TXT_NOT_GOOD_IDEA,
TXT_INVALID_NUMBER,
TXT_INVALID_TIME, TXT_INVALID_TIME,
TXT_INVALID_LEVEL, TXT_INVALID_LEVEL,
TXT_INVALID_SIZE, TXT_INVALID_SIZE,