util/UriUtil: uri_get_suffix() fails if name begins with dot

A file called ".jpg" is not a JPEG file with an empty name; it is merely a hidden file.

util/UriUtil: uri_get_suffix() fails if name begins with dot
afc70c12 · Max Kellermann · d7f80eab · afc70c12 · afc70c12
Commit afc70c12 authored Dec 29, 2013 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

UriUtil.cxx src/util/UriUtil.cxx +2 -1

test_util.cxx test/test_util.cxx +4 -0

No files found.
--- a/src/util/UriUtil.cxx
+++ b/src/util/UriUtil.cxx
@@ -32,7 +32,8 @@ const char *
 uri_get_suffix(const char *uri)
 {
 	const char *suffix = strrchr(uri, '.');
-	if (suffix == nullptr)
+	if (suffix == nullptr || suffix == uri ||
+	    suffix[-1] == '/' || suffix[-1] == '\\')
 		return nullptr;

 	++suffix;

--- a/test/test_util.cxx
+++ b/test/test_util.cxx
@@ -29,6 +29,10 @@ public:
 					       "jpg"));
 		CPPUNIT_ASSERT_EQUAL(0, strcmp(uri_get_suffix("/foo.png/bar.jpg"),
 					       "jpg"));
+		CPPUNIT_ASSERT_EQUAL((const char *)nullptr,
+				     uri_get_suffix(".jpg"));
+		CPPUNIT_ASSERT_EQUAL((const char *)nullptr,
+				     uri_get_suffix("/foo/.jpg"));
 	}

 	void TestRemoveAuth() {