mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

Validate that data read from prefs and state files is valid UTF-8.

This commit is contained in:
Josh Elsasser 2006-01-30 20:01:08 +00:00
parent 8d401347b6
commit 60f10df45e
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gtk/conf.c
View File

@ -170,7 +170,8 @@ cf_loadprefs(char **errstr) {
goto done;
case G_IO_STATUS_NORMAL:
if(NULL != line) {
if(NULL != (sep = strchr(line, PREF_SEP_KEYVAL)) && sep > line) {
if(g_utf8_validate(line, len, NULL) &&
NULL != (sep = strchr(line, PREF_SEP_KEYVAL)) && sep > line) {
*sep = '\0';
line[termpos] = '\0';
g_tree_insert(prefs, g_strcompress(line), g_strcompress(sep + 1));
@ -332,15 +333,17 @@ cf_loadstate(char **errstr) {
goto done;
case G_IO_STATUS_NORMAL:
if(NULL != line) {
ts = g_new0(struct cf_torrentstate, 1);
ptr = line;
while(NULL != (ptr = getstateval(ts, ptr)))
;
if(g_utf8_validate(line, -1, NULL)) {
ts = g_new0(struct cf_torrentstate, 1);
ptr = line;
while(NULL != (ptr = getstateval(ts, ptr)))
;
if(NULL != ts->ts_torrent && NULL != ts->ts_directory)
ret = g_list_append(ret, ts);
else
cf_freestate(ts);
}
g_free(line);
if(NULL != ts->ts_torrent && NULL != ts->ts_directory)
ret = g_list_append(ret, ts);
else
cf_freestate(ts);
}
break;
case G_IO_STATUS_EOF:
@ -438,8 +441,6 @@ cf_savestate(int count, tr_stat_t *torrents, char **errstr) {
io = g_io_channel_unix_new(fd);
g_io_channel_set_close_on_unref(io, TRUE);
/* XXX what the hell should I be doing about unicode? */
err = NULL;
for(ii = 0; ii < count; ii++) {
/* XXX need a better way to query running/stopped state */