From 65edf30ef0f8d553051f6618f6f5bc67c9170011 Mon Sep 17 00:00:00 2001 From: Jason Turner Date: Mon, 15 Nov 2010 22:45:57 +0000 Subject: [PATCH] Fix regression in parsing of empty file. Visible in windows debug mode, but probably affects all platforms. --- include/chaiscript/language/chaiscript_engine.hpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/include/chaiscript/language/chaiscript_engine.hpp b/include/chaiscript/language/chaiscript_engine.hpp index 9573b766..91b172e7 100644 --- a/include/chaiscript/language/chaiscript_engine.hpp +++ b/include/chaiscript/language/chaiscript_engine.hpp @@ -22,6 +22,7 @@ #endif #endif + #include #include @@ -499,10 +500,15 @@ namespace chaiscript infile.seekg(0, std::ios::beg); assert(size >= 0); - std::vector v(static_cast(size)); - infile.read(&v[0], size); - return std::string(v.begin(), v.end()); + if (size == std::streampos(0)) + { + return std::string(); + } else { + std::vector v(static_cast(size)); + infile.read(&v[0], size); + return std::string(v.begin(), v.end()); + } } /**