Bugfix to account for single dot input.

Signed-off-by: Mei Chu <[email protected]>
meimchu · Mar 31, 2024 · 0763c37 · 0763c37
1 parent 537431d
commit 0763c37
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/src/OpenColorIO/transforms/FileTransform.cpp b/src/OpenColorIO/transforms/FileTransform.cpp
@@ -531,7 +531,12 @@ bool FormatRegistry::isFormatExtensionSupported(const char * extension) const
 {
     FileFormatVectorMap::const_iterator iter;
     // If dot is present at the start, pointer arithmetic increment up by one to ignore that dot.
-    if (extension[0] == '.')
+    // Early return false with malicious input of just the dot.
+    if (0 == strcmp(extension, "."))
+    {
+        return false;
+    }
+    else if (extension[0] == '.')
     {
         iter = m_formatsByExtension.find(StringUtils::Lower(extension + 1));
     }

diff --git a/tests/cpu/transforms/FileTransform_tests.cpp b/tests/cpu/transforms/FileTransform_tests.cpp
@@ -295,6 +295,7 @@ OCIO_ADD_TEST(FileTransform, is_format_extension_supported)
     OCIO::FormatRegistry & formatRegistry = OCIO::FormatRegistry::GetInstance();
     OCIO_CHECK_EQUAL(formatRegistry.isFormatExtensionSupported("foo"), false);
     OCIO_CHECK_EQUAL(formatRegistry.isFormatExtensionSupported("bar"), false);
+    OCIO_CHECK_EQUAL(formatRegistry.isFormatExtensionSupported("."), false);
     OCIO_CHECK_ASSERT(formatRegistry.isFormatExtensionSupported("cdl"));
     OCIO_CHECK_ASSERT(formatRegistry.isFormatExtensionSupported(".cdl"));
     OCIO_CHECK_ASSERT(formatRegistry.isFormatExtensionSupported("Cdl"));

diff --git a/tests/python/FileTransformTest.py b/tests/python/FileTransformTest.py
@@ -91,6 +91,7 @@ def test_is_format_extension_supported(self):
         """
         self.assertFalse(self.tr.IsFormatExtensionSupported('foo'))
         self.assertFalse(self.tr.IsFormatExtensionSupported('bar'))
+        self.assertFalse(self.tr.IsFormatExtensionSupported('.'))
         self.assertTrue(self.tr.IsFormatExtensionSupported('cdl'))
         self.assertTrue(self.tr.IsFormatExtensionSupported('.cdl'))
         self.assertTrue(self.tr.IsFormatExtensionSupported('Cdl'))