aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2025-02-02 15:08:01 -05:00
Code

Expando lookup crashed with hi-ascii chars.

Browse Source 
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1774 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2001-08-31 16:47:14 +00:00 committed by cras
parent ff884ba0bb
commit 099c83a98e
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/core/expandos.c
View File

@ -48,7 +48,7 @@ typedef struct {
static int timer_tag; static int timer_tag;
static EXPANDO_REC *char_expandos[127]; static EXPANDO_REC *char_expandos[255];
static GHashTable *expandos; static GHashTable *expandos;
static time_t client_start_time; static time_t client_start_time;
static char *last_sent_msg, *last_sent_msg_body; static char *last_sent_msg, *last_sent_msg_body;
@ -56,8 +56,8 @@ static char *last_privmsg_from, *last_public_from;
static char *sysname, *sysrelease, *sysarch; static char *sysname, *sysrelease, *sysarch;
static const char *timestamp_format; static const char *timestamp_format;
#define CHAR_EXPANDOS_COUNT \ #define CHAR_EXPANDO(chr) \
((int) (sizeof(char_expandos) / sizeof(char_expandos[0]))) (char_expandos[(int) (unsigned char) chr])
/* Create expando - overrides any existing ones. */ /* Create expando - overrides any existing ones. */
void expando_create(const char *key, EXPANDO_FUNC func, ...) void expando_create(const char *key, EXPANDO_FUNC func, ...)
@ -73,7 +73,7 @@ void expando_create(const char *key, EXPANDO_FUNC func, ...)
rec = g_hash_table_lookup(expandos, key); rec = g_hash_table_lookup(expandos, key);
else { else {
/* single character expando */ /* single character expando */
rec = char_expandos[(int) *key]; rec = CHAR_EXPANDO(*key);
} }
if (rec != NULL) if (rec != NULL)
@ -83,7 +83,7 @@ void expando_create(const char *key, EXPANDO_FUNC func, ...)
if (key[1] != '\0') if (key[1] != '\0')
g_hash_table_insert(expandos, g_strdup(key), rec); g_hash_table_insert(expandos, g_strdup(key), rec);
else else
char_expandos[(int) *key] = rec; char_expandos[(int) (unsigned char) *key] = rec;
} }
rec->func = func; rec->func = func;
@ -99,7 +99,7 @@ static EXPANDO_REC *expando_find(const char *key)
if (key[1] != '\0') if (key[1] != '\0')
return g_hash_table_lookup(expandos, key); return g_hash_table_lookup(expandos, key);
else else
return char_expandos[(int) *key]; return CHAR_EXPANDO(*key);
} }
/* Add new signal to expando */ /* Add new signal to expando */
@ -136,9 +136,9 @@ void expando_destroy(const char *key, EXPANDO_FUNC func)
if (key[1] == '\0') { if (key[1] == '\0') {
/* single character expando */ /* single character expando */
rec = char_expandos[(int) *key]; rec = CHAR_EXPANDO(*key);
if (rec != NULL && rec->func == func) { if (rec != NULL && rec->func == func) {
char_expandos[(int) *key] = NULL; char_expandos[(int) (unsigned char) *key] = NULL;
g_free(rec); g_free(rec);
} }
} else if (g_hash_table_lookup_extended(expandos, key, &origkey, } else if (g_hash_table_lookup_extended(expandos, key, &origkey,
@ -211,10 +211,8 @@ void expando_unbind(const char *key, int funccount, SIGNAL_FUNC *funcs)
EXPANDO_FUNC expando_find_char(char chr) EXPANDO_FUNC expando_find_char(char chr)
{ {
g_return_val_if_fail(chr < CHAR_EXPANDOS_COUNT, NULL); return CHAR_EXPANDO(chr) == NULL ? NULL :
CHAR_EXPANDO(chr)->func;
return char_expandos[(int) chr] == NULL ? NULL :
char_expandos[(int) chr]->func;
} }
EXPANDO_FUNC expando_find_long(const char *key) EXPANDO_FUNC expando_find_long(const char *key)
@ -560,7 +558,7 @@ void expandos_deinit(void)
{ {
int n; int n;
for (n = 0; n < CHAR_EXPANDOS_COUNT; n++) for (n = 0; n < sizeof(char_expandos)/sizeof(char_expandos[0]); n++)
g_free_not_null(char_expandos[n]); g_free_not_null(char_expandos[n]);
expando_destroy("sysname", expando_sysname); expando_destroy("sysname", expando_sysname);