Changeset: 9d72dce4135a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/9d72dce4135a
Branch: manti
Log Message:
merged with default
diffs (22 lines):
diff --git a/sql/server/sql_scan.c b/sql/server/sql_scan.c
--- a/sql/server/sql_scan.c
+++ b/sql/server/sql_scan.c
@@ -887,8 +887,8 @@ scanner_string(mvc *c, int quote, bool e
const size_t yycur = rs->pos + lc->yycur;
while (cur != EOF && (quote != '"' || cur != 0xFEFF) && pos <
limit &&
- (cur = rs->buf[yycur + pos++]) != 0 &&
- (cur != quote || escape)) {
+ (((cur = rs->buf[yycur + pos++]) & 0x80) == 0) &&
+ cur && (cur != quote || escape)) {
if (escapes && cur == '\\')
escape = !escape;
else
@@ -921,6 +921,7 @@ scanner_string(mvc *c, int quote, bool e
cur = scanner_read_more(c, 1);
} else {
cur = scanner_getc(c);
+ escape = false;
}
}
(void) sql_error(c, 2, "%s", lc->errstr ? lc->errstr : SQLSTATE(42000)
"Unexpected end of input");
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
