commit d6808f6ba03f74f99759e8d59ac0a04fcc9c6dd8
author Eike Rathke <erack@redhat.com> Mon Aug 16 21:46:44 2021 +0200
committer Caolán McNamara <caolanm@redhat.com> Tue Aug 17 10:51:59 2021 +0200
tree 75183d0c5fcddebbfb5d9a46e5507c602f51d122
parent 58ba1b975d75225222a27ff404281b9bff133143

Resolves: tdf#96561 Include embedded null-characters while assembling CSV line

... instead of prematurely ending analysis and skipping the
remainder that is still part of data read.

Change-Id: I8f34bc9672e37f9c1c1ae81ddeba464360add7c2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120555
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins
(cherry picked from commit 7bd03074ae7362d8fffe5182529626a0b43a0ed1)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120451
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

sc/source/ui/docshell/impex.cxx

diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index 380bd87..6297fba 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -2515,8 +2515,17 @@ Label_RetryWithNewSep:
        while (!rStream.eof() && aStr.getLength() < nArbitraryLineLengthLimit)
        {
            const sal_Unicode * p = aStr.getStr() + nLastOffset;
            while (*p)
            const sal_Unicode * const pStop = aStr.getStr() + aStr.getLength();
            while (p < pStop)
            {
                if (!*p)
                {
                    // Skip embedded null-characters. They don't change
                    // anything and are handled at a higher level.
                    ++p;
                    continue;
                }

                if (nQuotes)
                {
                    if (*p == cFieldQuote)