iiiypuk/hexchat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix various crashes with pluginpref

Browse Source
This commit is contained in:
TingPing 2014-07-21 07:35:32 -04:00
parent 3181c3c192
commit 6540c0ff68
1 changed files with 18 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/common/plugin.c
View File

@ -1891,58 +1891,41 @@ hexchat_pluginpref_set_str (hexchat_plugin *pl, const char *var, const char *val
return hexchat_pluginpref_set_str_real (pl, var, value, 1); return hexchat_pluginpref_set_str_real (pl, var, value, 1);
} }
int static int
hexchat_pluginpref_get_str (hexchat_plugin *pl, const char *var, char *dest) hexchat_pluginpref_get_str_real (hexchat_plugin *pl, const char *var, char *dest, int dest_len)
{ {
int fh; char *confname, *canon, *cfg;
int l;
char confname[64];
char *canon;
char *cfg;
struct stat st;
canon = g_strdup (pl->name); canon = g_strdup (pl->name);
canonalize_key (canon); canonalize_key (canon);
sprintf (confname, "addon_%s.conf", canon); confname = g_strdup_printf ("%s%caddon_%s.conf", get_xdir(), G_DIR_SEPARATOR, canon);
g_free (canon); g_free (canon);
/* partly borrowed from palette.c */ if (!g_file_get_contents (confname, &cfg, NULL, NULL))
fh = hexchat_open_file (confname, O_RDONLY, 0, 0);
if (fh == -1)
{ {
g_free (confname);
return 0; return 0;
} }
fstat (fh, &st); g_free (confname);
cfg = malloc (st.st_size + 1);
if (!cfg) if (!cfg_get_str (cfg, var, dest, dest_len))
{ {
close (fh); g_free (cfg);
return 0; return 0;
} }
cfg[0] = '\0'; g_free (cfg);
l = read (fh, cfg, st.st_size);
if (l >= 0)
{
cfg[l] = '\0';
}
if (!cfg_get_str (cfg, var, dest, 512)) /* dest_len is the same as buffer size in set */
{
free (cfg);
close (fh);
return 0;
}
free (cfg);
close (fh);
return 1; return 1;
} }
int
hexchat_pluginpref_get_str (hexchat_plugin *pl, const char *var, char *dest)
{
/* All users of this must ensure dest is >= 512... */
return hexchat_pluginpref_get_str_real (pl, var, dest, 512);
}
int int
hexchat_pluginpref_set_int (hexchat_plugin *pl, const char *var, int value) hexchat_pluginpref_set_int (hexchat_plugin *pl, const char *var, int value)
{ {
@ -1957,7 +1940,7 @@ hexchat_pluginpref_get_int (hexchat_plugin *pl, const char *var)
{ {
char buffer[12]; char buffer[12];
if (hexchat_pluginpref_get_str (pl, var, buffer)) if (hexchat_pluginpref_get_str_real (pl, var, buffer, sizeof(buffer)))
{ {
return atoi (buffer); return atoi (buffer);
} }