From 02b5aaafabdea44f46a8238469f74115415d58f1 Mon Sep 17 00:00:00 2001
From: Thomas Fischer <thomas.fischer@ufz.de>
Date: Fri, 18 Jan 2013 08:07:23 +0100
Subject: [PATCH] Fixed a potential memory access violation, using C++11 auto.
---
BaseLib/FileFinder.h | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/BaseLib/FileFinder.h b/BaseLib/FileFinder.h
index 13cc9af3876..db0d0e5dba3 100644
--- a/BaseLib/FileFinder.h
+++ b/BaseLib/FileFinder.h
@@ -41,6 +41,9 @@ public:
*/
void addDirectory(std::string const& dir)
{
+ if (dir.empty())
+ return;
+
if (dir[dir.size() - 1] != '/')
_directories.push_back(std::string(dir + "/"));
else
@@ -57,8 +60,7 @@ public:
if (_directories.empty())
ERR("FileFinder::getPath(): No directories set.");
- for (std::vector<std::string>::const_iterator it = _directories.begin(); it
- != _directories.end(); ++it)
+ for (auto it = _directories.begin(); it != _directories.end(); ++it)
{
std::string testDir(*it);
std::ifstream is(testDir.append(filename).c_str());
--
GitLab