From 363f32536b386357fb679f616066b391b5377fae Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Wed, 28 Apr 2010 20:21:28 +0000
Subject: [PATCH] From Farshid Lashkari, "There's a subtle bug in
 osgDB::getFileExtension where it returns an incorrect value if the filename
 does not contain an extension but a sub-directory contains a dot character.
 I've modified the function so that it checks for this case."

---
 src/osgDB/FileNameUtils.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/osgDB/FileNameUtils.cpp b/src/osgDB/FileNameUtils.cpp
index fd78a5df3..ee2b2131e 100644
--- a/src/osgDB/FileNameUtils.cpp
+++ b/src/osgDB/FileNameUtils.cpp
@@ -50,14 +50,16 @@ std::string osgDB::getSimpleFileName(const std::string& fileName)
 std::string osgDB::getFileExtension(const std::string& fileName)
 {
     std::string::size_type dot = fileName.find_last_of('.');
-    if (dot==std::string::npos) return std::string("");
+    std::string::size_type slash = fileName.find_last_of("/\\");
+    if (dot==std::string::npos || (slash!=std::string::npos && dot<slash)) return std::string("");
     return std::string(fileName.begin()+dot+1,fileName.end());
 }
 
 std::string osgDB::getFileExtensionIncludingDot(const std::string& fileName)
 {
     std::string::size_type dot = fileName.find_last_of('.');
-    if (dot==std::string::npos) return std::string("");
+    std::string::size_type slash = fileName.find_last_of("/\\");
+    if (dot==std::string::npos || (slash!=std::string::npos && dot<slash)) return std::string("");
     return std::string(fileName.begin()+dot,fileName.end());
 }