diff options
| -rw-r--r-- | third_party/nix/src/libstore/derivations.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/third_party/nix/src/libstore/derivations.cc b/third_party/nix/src/libstore/derivations.cc index 978d39b94e7d..007c268bab2a 100644 --- a/third_party/nix/src/libstore/derivations.cc +++ b/third_party/nix/src/libstore/derivations.cc @@ -3,6 +3,7 @@ #include <absl/strings/match.h> #include <absl/strings/str_split.h> #include <absl/strings/string_view.h> +#include <glog/logging.h> #include "libstore/fs-accessor.hh" #include "libstore/globals.hh" @@ -97,7 +98,7 @@ static std::string parseString(std::istream& str) { std::string res; expect(str, "\""); int c; - while ((c = str.get()) != '"') { + while ((c = str.get()) != '"' && c != EOF) { if (c == '\\') { c = str.get(); if (c == 'n') { @@ -106,11 +107,13 @@ static std::string parseString(std::istream& str) { res += '\r'; } else if (c == 't') { res += '\t'; + } else if (c == EOF) { + throw FormatError("unexpected EOF while parsing C-style escape"); } else { - res += c; + res += static_cast<char>(c); } } else { - res += c; + res += static_cast<char>(c); } } return res; |