Skip to content

M
mpd
Commit 7ac3abf4 authored by Konstantin Sobolev's avatar Konstantin Sobolev Committed by Max Kellermann
Browse files
Options

update: pass UTF-8 path to skip_symlink()

skip_symlinks() expects an UTF-8 encoded file name, but updateDirectory() passed ent->d_name (in file system encoding) to it. Convert it to UTF-8 first.
parent 23b09759
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
src/update.c
View file @ 7ac3abf4
...@@ -389,12 +389,11 @@ updateDirectory(struct directory *directory, const struct stat *st) ...@@ -389,12 +389,11 @@ updateDirectory(struct directory *directory, const struct stat *st)
char *utf8; char *utf8;
struct stat st2; struct stat st2;
if (skip_path(ent->d_name) || if (skip_path(ent->d_name))
skip_symlink(directory, ent->d_name))
continue; continue;
utf8 = fs_charset_to_utf8(path_max_tmp, ent->d_name); utf8 = fs_charset_to_utf8(path_max_tmp, ent->d_name);
if (!utf8) if (utf8 == NULL || skip_symlink(directory, utf8))
continue; continue;
if (stat_directory_child(directory, utf8, &st2) == 0) if (stat_directory_child(directory, utf8, &st2) == 0)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment