aboutsummaryrefslogtreecommitdiffstats
path: root/src/UpdateWalk.cxx
diff options
context:
space:
mode:
authorDenis Krjuchkov <denis@crazydev.net>2013-01-27 13:26:17 +0600
committerDenis Krjuchkov <denis@crazydev.net>2013-01-28 00:13:46 +0600
commite98e2a0b07363132707146f571d3411e3e1b8076 (patch)
treece4653efde5670ca2a151e2888114ac9c0423fe4 /src/UpdateWalk.cxx
parent943064bb5148884339ccaf60e276191bc4d9abd9 (diff)
downloadmpd-e98e2a0b07363132707146f571d3411e3e1b8076.tar.gz
mpd-e98e2a0b07363132707146f571d3411e3e1b8076.tar.xz
mpd-e98e2a0b07363132707146f571d3411e3e1b8076.zip
Path::FromUTF8() returns nulled instance on error, add error handling where required
Diffstat (limited to '')
-rw-r--r--src/UpdateWalk.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/UpdateWalk.cxx b/src/UpdateWalk.cxx
index 3e0dfe48d..322a8fce2 100644
--- a/src/UpdateWalk.cxx
+++ b/src/UpdateWalk.cxx
@@ -104,7 +104,7 @@ remove_excluded_from_directory(Directory *directory,
directory_for_each_child_safe(child, n, directory) {
const Path name_fs = Path::FromUTF8(child->GetName());
- if (exclude_list.Check(name_fs.c_str())) {
+ if (name_fs.IsNull() || exclude_list.Check(name_fs.c_str())) {
delete_directory(child);
modified = true;
}
@@ -115,7 +115,7 @@ remove_excluded_from_directory(Directory *directory,
assert(song->parent == directory);
const Path name_fs = Path::FromUTF8(song->uri);
- if (exclude_list.Check(name_fs.c_str())) {
+ if (name_fs.IsNull() || exclude_list.Check(name_fs.c_str())) {
delete_song(directory, song);
modified = true;
}