summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2017-07-26 07:36:18 +0200
committerGitHub <noreply@github.com>2017-07-26 07:36:18 +0200
commitedacc986d6bd14602e32e0fba95a6bb1738b423b (patch)
treea2e7999ce410d6da88fc1a743343324d3b7f4d54
parentf5277e347df4228fc875acaa3acb9581a30ab43e (diff)
parent2144093fe694a82f270d6b4f84a6b09db8820c49 (diff)
Merge pull request #9857 from marcelofg55/master
Fix cvs files freezing the editor when a double quote is not closed
-rw-r--r--core/os/file_access.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/os/file_access.cpp b/core/os/file_access.cpp
index 2bb676381f..7f5a84843c 100644
--- a/core/os/file_access.cpp
+++ b/core/os/file_access.cpp
@@ -300,6 +300,8 @@ Vector<String> FileAccess::get_csv_line(String delim) const {
String l;
int qc = 0;
do {
+ ERR_FAIL_COND_V(eof_reached(), Vector<String>());
+
l += get_line() + "\n";
qc = 0;
for (int i = 0; i < l.length(); i++) {