Avoid array-bounds error when debug/fortify enabled

This code causes GCC to error out due to a bounds error with the following set

	-D_GLIBCXX_DEBUG
	-D_FORTIFY_SOURCE=2

The solution is to copy via iterator.

diff --git a/util/expression_path.h b/util/expression_path.h
index 3075b4d42ca70ae1a632c970d657d0890bcfceeb..ac4ca97dae6f5810a3b7e5245c5149d5cf0e24a0 100644 (file)
--- a/util/expression_path.h
+++ b/util/expression_path.h
@@ -56,9 +56,8 @@ std::string inferExpressionPath(const std::string &sigFile) {
     // POSIX variant.
 
     // dirname() may modify its argument, so we must make a copy.
-    std::vector<char> path(sigFile.size() + 1);
-    memcpy(path.data(), sigFile.c_str(), sigFile.size());
-    path[sigFile.size()] = 0; // ensure null termination.
+    std::vector<char> path(sigFile.begin(), sigFile.end());
+    path.push_back(0); // ensure null termination.
 
     std::string rv = dirname(path.data());
 #else