From 2276e7677b5fc9154bc5019325100da96ca9967a Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Wed, 15 Aug 2012 22:19:03 +0200
Subject: [PATCH] mapper: fix potential crash in file permission check

---
 NEWS         | 1 +
 src/mapper.c | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index 4aaa75ca2..ea40aa8a8 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,7 @@ ver 0.17.2 (2012/??/??)
   - httpd: use monotonic clock, avoid hiccups after system clock adjustment
   - httpd: fix throttling bug after resuming playback
 * mapper: fix non-UTF8 music directory name
+* mapper: fix potential crash in file permission check
 
 
 ver 0.17.1 (2012/07/31)
diff --git a/src/mapper.c b/src/mapper.c
index 6a968e32d..7db74b1af 100644
--- a/src/mapper.c
+++ b/src/mapper.c
@@ -93,10 +93,10 @@ check_directory(const char *path)
 #endif
 
 	DIR *dir = opendir(path);
-	if (dir == NULL && errno == EACCES)
-		g_warning("No permission to read directory: %s", path);
-	else
+	if (dir != NULL)
 		closedir(dir);
+	else if (errno == EACCES)
+		g_warning("No permission to read directory: %s", path);
 }
 
 static void