diff options
| author | Lionel Elie Mamane <lionel@mamane.lu> | 2020-05-08 07:51:53 +0200 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2020-06-06 09:30:57 +0100 |
| commit | f694ac14bd5f5b582c43dc65b79cc4ce61c737c3 (patch) | |
| tree | 8a4aa021e0dc0ee0f92a5526470cfcc0b3d62785 /connectivity | |
| parent | 662ffed0d6e64c5976d0eb412e0db51e28d2b29b (diff) | |
tdf#122461 SQL identifiers (names) can contain newlines
Change-Id: Ic58e6b65e146b2e0d9cb656aa5fa06cfe955d11d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93690
Tested-by: Jenkins
Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu>
(cherry picked from commit b6ab865a371f5c46f96d931721f03afde82b7ec1)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93787
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/parse/sqlflex.l | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/connectivity/source/parse/sqlflex.l b/connectivity/source/parse/sqlflex.l index 1002ecef7970..2269d1c6e52c 100644 --- a/connectivity/source/parse/sqlflex.l +++ b/connectivity/source/parse/sqlflex.l @@ -526,6 +526,8 @@ sal_Int32 gatherString(int delim, sal_Int32 nTyp) int ch; OStringBuffer sBuffer(256); + assert(nTyp == 0 || nTyp == 1 || nTyp == 2); + while (!checkeof(ch = yyinput())) { if (ch == delim) @@ -554,7 +556,7 @@ sal_Int32 gatherString(int delim, sal_Int32 nTyp) } } - else if (nTyp != 1 && (ch == '\r' || ch == '\n') ) + else if (nTyp == 2 && (ch == '\r' || ch == '\n') ) break; else { |