diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-07-22 13:51:19 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-07-22 14:17:22 +0100 |
| commit | cbea6a709f33babfb490ab1bd07cde8cc08114ac (patch) | |
| tree | 86e0a84249a0594ba391d0d7efeeeb50b0447249 | |
| parent | 96d44c9b077a6cc8068067a795dc63248ab90fea (diff) | |
xstUsrInitl contains max 9 chars
Change-Id: Ia40d037d7af6cd3a283aa12948e4c5565dcb2ae6
| -rw-r--r-- | sw/qa/core/data/ww8/pass/crash-1.doc | bin | 0 -> 10240 bytes | |||
| -rw-r--r-- | sw/source/filter/ww8/ww8par.cxx | 11 |
2 files changed, 7 insertions, 4 deletions
diff --git a/sw/qa/core/data/ww8/pass/crash-1.doc b/sw/qa/core/data/ww8/pass/crash-1.doc Binary files differnew file mode 100644 index 000000000000..9f6b25348c64 --- /dev/null +++ b/sw/qa/core/data/ww8/pass/crash-1.doc diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 4d82b50b72aa..02d26f4cbf9d 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -2170,15 +2170,18 @@ long SwWW8ImplReader::Read_And(WW8PLCFManResult* pRes) if (pA) sAuthor = *pA; else - sAuthor = OUString(pDescri->xstUsrInitl + 1, pDescri->xstUsrInitl[0], - RTL_TEXTENCODING_MS_1252); + { + const sal_uInt8 nLen = std::min<sal_uInt8>(pDescri->xstUsrInitl[0], + SAL_N_ELEMENTS(pDescri->xstUsrInitl)-1); + sAuthor = OUString(pDescri->xstUsrInitl + 1, nLen, RTL_TEXTENCODING_MS_1252); + } } else { const WW8_ATRD* pDescri = static_cast<const WW8_ATRD*>(pSD->GetData()); - { - const sal_uInt16 nLen = SVBT16ToShort(pDescri->xstUsrInitl[0]); + const sal_uInt16 nLen = std::min<sal_uInt16>(SVBT16ToShort(pDescri->xstUsrInitl[0]), + SAL_N_ELEMENTS(pDescri->xstUsrInitl)-1); OUStringBuffer aBuf; aBuf.setLength(nLen); for(sal_uInt16 nIdx = 1; nIdx <= nLen; ++nIdx) |