mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix memchr checks

Browse Source 
(thanks caolan for spotting)

Change-Id: I17093b4173b9a2fca2760240375bcb14313224ef
This commit is contained in:
Stephan Bergmann
2014-11-18 11:18:04 +01:00
parent 04d4b703a0
commit 24714f5eaa
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
registry/source/reflread.cxx
View File

@@ -363,7 +363,8 @@ const sal_Char* ConstantPool::readUTF8NameConstant(sal_uInt16 index)
if (readUINT16(m_pIndex[index - 1] + CP_OFFSET_ENTRY_TAG) == CP_TAG_UTF8_NAME) if (readUINT16(m_pIndex[index - 1] + CP_OFFSET_ENTRY_TAG) == CP_TAG_UTF8_NAME)
{ {
sal_uInt32 n = m_pIndex[index - 1] + CP_OFFSET_ENTRY_DATA; sal_uInt32 n = m_pIndex[index - 1] + CP_OFFSET_ENTRY_DATA;
if (n < m_bufferLen && std::memchr(m_pBuffer, 0, n) != nullptr) if (n < m_bufferLen
&& std::memchr(m_pBuffer + n, 0, m_bufferLen - n) != nullptr)
{ {
aName = (const sal_Char*) (m_pBuffer + n); aName = (const sal_Char*) (m_pBuffer + n);
} }
@@ -564,7 +565,9 @@ const sal_Unicode* ConstantPool::readStringConstant(sal_uInt16 index)
if (readUINT16(m_pIndex[index - 1] + CP_OFFSET_ENTRY_TAG) == CP_TAG_CONST_STRING) if (readUINT16(m_pIndex[index - 1] + CP_OFFSET_ENTRY_TAG) == CP_TAG_CONST_STRING)
{ {
sal_uInt32 n = m_pIndex[index - 1] + CP_OFFSET_ENTRY_DATA; sal_uInt32 n = m_pIndex[index - 1] + CP_OFFSET_ENTRY_DATA;
if (n >= m_bufferLen || std::memchr(m_pBuffer, 0, n) == nullptr) if (n >= m_bufferLen
|| (std::memchr(m_pBuffer + n, 0, m_bufferLen - n)
== nullptr))
{ {
throw BoundsError(); throw BoundsError();
} }