catalog: fix language detection

[elogind.git] / src / journal / catalog.c

diff --git a/src/journal/catalog.c b/src/journal/catalog.c
index 2be81aa2f7db37940f810150a745ad87ac5bd0d9..e3a3354ab7ffdc3003c71ffeb08e888857c9dae5 100644 (file)
--- a/src/journal/catalog.c
+++ b/src/journal/catalog.c
@@ -150,10 +150,10 @@ int catalog_file_lang(const char* filename, char **lang) {
                 return 0;
 
         beg = end - 1;
-        while (beg > filename && *beg != '.')
+        while (beg > filename && *beg != '.' && *beg != '/' && end - beg < 32)
                 beg --;
 
-        if (beg <= filename || end <= beg + 1 || end - beg > 32)
+        if (*beg != '.' || end <= beg + 1)
                 return 0;
 
         _lang = strndup(beg + 1, end - beg - 1);