diff --git a/lib/media/mediafile.php b/lib/media/mediafile.php
index 2eb77c08c6..ffcf1ed866 100644
--- a/lib/media/mediafile.php
+++ b/lib/media/mediafile.php
@@ -281,6 +281,8 @@ class MediaFile
             return false;
         } elseif ($ret === 0) {
             return null; // No match
+        } elseif (strlen($matches[2]) % 2 !== 0) {
+            return null; // An odd length won't do for hex2bin
         } else {
             $filename = hex2bin($matches[2]);