diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-08-05 19:15:36 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-08-07 23:08:21 +0200 |
| commit | 12569ca783263be8797ff19b532a9f03c34b4c2a (patch) | |
| tree | b9879d46064f6e415e99822384295033b1d18545 | |
| parent | c28ceacf6a1aedb4c965a513c72f7570244fbb6f (diff) | |
ofz#2867 null deref
Reviewed-on: https://gerrit.libreoffice.org/40792
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 42b894f80a6d0c39bb0f7092eb204a15c22c4f38)
Change-Id: If856473683685d79d88b024f7fafa2920b403bb7
Reviewed-on: https://gerrit.libreoffice.org/40794
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Jenkins <ci@libreoffice.org>
| -rw-r--r-- | sc/qa/unit/data/slk/pass/numfmt-2.slk | 1 | ||||
| -rw-r--r-- | svl/source/numbers/zforscan.cxx | 19 |
2 files changed, 12 insertions, 8 deletions
diff --git a/sc/qa/unit/data/slk/pass/numfmt-2.slk b/sc/qa/unit/data/slk/pass/numfmt-2.slk new file mode 100644 index 000000000000..5989cdc3e64e --- /dev/null +++ b/sc/qa/unit/data/slk/pass/numfmt-2.slk @@ -0,0 +1 @@ +P;P d S0
\ No newline at end of file diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx index 2f08c600730d..4098fc9e85b3 100644 --- a/svl/source/numbers/zforscan.cxx +++ b/svl/source/numbers/zforscan.cxx @@ -2503,17 +2503,20 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& rString ) nTypeArray[i] = NF_SYMBOLTYPE_DIGIT; OUString& rStr = sStrArray[i]; i++; - nPos = nPos + sStrArray[i].getLength(); - nCounter++; - while (i < nAnzStrings && - sStrArray[i][0] == '0') + if (i < nAnzStrings) { - rStr += sStrArray[i]; nPos = nPos + sStrArray[i].getLength(); - nTypeArray[i] = NF_SYMBOLTYPE_EMPTY; - nAnzResStrings--; nCounter++; - i++; + while (i < nAnzStrings && + sStrArray[i][0] == '0') + { + rStr += sStrArray[i]; + nPos = nPos + sStrArray[i].getLength(); + nTypeArray[i] = NF_SYMBOLTYPE_EMPTY; + nAnzResStrings--; + nCounter++; + i++; + } } } else |