starmath/source/smdetect.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 256a405d4b1feeafd8a09e98bce9fb0c9125ee3d
Author: Caolán McNamara <caol...@redhat.com>
Date: Sun Sep 17 14:22:45 2017 +0100
valgrind: Conditional jump or move depends on uninitialised value
Conditional jump or move depends on uninitialised value(s)
at 0x4C3535E: strstr (vg_replace_strmem.c:1623)
by 0x4FCD9E59:
SmFilterDetect::detect(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>&)
(smdetect.cxx:102)
by 0x41A1A774:
filter::config::TypeDetection::impl_askDetectService(rtl::OUString const&,
utl::MediaDescriptor&) (typedetection.cxx:1038)
Change-Id: I2f98fd3f7799f34cb5bd9242379ce6440645034d
Reviewed-on: https://gerrit.libreoffice.org/42381
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
(cherry picked from commit 64aa36e8b999ea4dcad69904da941705effad618)
Reviewed-on: https://gerrit.libreoffice.org/42387
Reviewed-by: Michael Stahl <mst...@redhat.com>
diff --git a/starmath/source/smdetect.cxx b/starmath/source/smdetect.cxx
index 18dfa736bd51..91c8733bf13c 100644
--- a/starmath/source/smdetect.cxx
+++ b/starmath/source/smdetect.cxx
@@ -93,12 +93,12 @@ OUString SAL_CALL SmFilterDetect::detect( Sequence<
PropertyValue >& lDescriptor
// stuff I hope?
static const sal_uInt16 nBufferSize = 200;
char aBuffer[nBufferSize+1];
- aBuffer[nBufferSize] = 0;
pInStrm->Seek( STREAM_SEEK_TO_BEGIN );
pInStrm->StartReadingUnicodeText( RTL_TEXTENCODING_DONTKNOW ); //
avoid BOM marker
sal_uLong nBytesRead = pInStrm->ReadBytes( aBuffer, nBufferSize );
if (nBytesRead >= 6)
{
+ aBuffer[nBytesRead] = 0;
bool bIsMathType = false;
if (0 == strncmp( "<?xml", aBuffer, 5))
bIsMathType = (strstr( aBuffer, "<math>" ) ||
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
