[Libreoffice-commits] core.git: vcl/workben

[Caolán McNamara (via logerrit)]

 vcl/workben/commonfuzzer.hxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 8ef6d40a1cdaceb3479656aa32644e8c5d2f7e72
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Sep 1 16:46:29 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Sep 1 18:00:40 2021 +0200

    ofz: set JSIMD_FORCENONE for msan to handle jpeg_read_scanlines
    
    see: https://github.com/libjpeg-turbo/libjpeg-turbo/issues/253
    
    to silence...
    
    ==255714==WARNING: MemorySanitizer: use-of-uninitialized-value
        #0 0x546d121 in ycck_cmyk_convert workdir/UnpackedTarball/libjpeg-turbo/jdcolor.c:565:19
        #1 0x53d456f in sep_upsample workdir/UnpackedTarball/libjpeg-turbo/jdsample.c:98:3
        #2 0x547c7bf in process_data_context_main workdir/UnpackedTarball/libjpeg-turbo/jdmainct.c:374:5
        #3 0x5393146 in jpeg_read_scanlines workdir/UnpackedTarball/libjpeg-turbo/jdapistd.c:287:3
        #4 0x219f00d in ReadJPEG((anonymous namespace)::JpegStuff&, JPEGReader*, void*, long*, GraphicFilterImportFlags, vcl::ScopedBitmapAccess<BitmapWriteAccess, Bitmap, &(Bitmap::AcquireWriteAccess())>*) libreoffice/vcl/source/filter/jpeg/jpegc.cxx:282:17
        #5 0x219d9ad in ReadJPEG(JPEGReader*, void*, long*, GraphicFilterImportFlags, vcl::ScopedBitmapAccess<BitmapWriteAccess, Bitmap, &(Bitmap::AcquireWriteAccess())>*) libreoffice/vcl/source/filter/jpeg/jpegc.cxx:333:5
        #6 0xd1b770 in JPEGReader::Read(Graphic&, GraphicFilterImportFlags, vcl::ScopedBitmapAccess<BitmapWriteAccess, Bitmap, &(Bitmap::AcquireWriteAccess())>*) libreoffice/vcl/source/filter/jpeg/JpegReader.cxx:295:5
    
      Uninitialized value was created by a heap allocation
        #0 0x555a1d in malloc llvm-project/compiler-rt/lib/msan/msan_interceptors.cpp:901:3
        #1 0x53f0360 in jpeg_get_large workdir/UnpackedTarball/libjpeg-turbo/jmemnobs.c:56:19
        #2 0x53e99bf in alloc_large workdir/UnpackedTarball/libjpeg-turbo/jmemmgr.c:393:30
        #3 0x53ea1de in alloc_sarray workdir/UnpackedTarball/libjpeg-turbo/jmemmgr.c:477:28
        #4 0x547b422 in jinit_d_main_controller workdir/UnpackedTarball/libjpeg-turbo/jdmainct.c:451:28
        #5 0x53b1f2c in master_selection workdir/UnpackedTarball/libjpeg-turbo/jdmaster.c:569:5
        #6 0x53b0133 in jinit_master_decompress workdir/UnpackedTarball/libjpeg-turbo/jdmaster.c:735:3
        #7 0x53908dd in jpeg_start_decompress workdir/UnpackedTarball/libjpeg-turbo/jdapistd.c:47:5
        #8 0x219eaa4 in ReadJPEG((anonymous namespace)::JpegStuff&, JPEGReader*, void*, long*, GraphicFilterImportFlags, vcl::ScopedBitmapAccess<BitmapWriteAccess, Bitmap, &(Bitmap::AcquireWriteAccess())>*) libreoffice/vcl/source/filter/jpeg/jpegc.cxx:265:13
    
    Change-Id: I6c276a025baba0e22cbf47f102019014fc7d5a36
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121477
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/workben/commonfuzzer.hxx b/vcl/workben/commonfuzzer.hxx
index fb8f874a0f74..977fb7cb501c 100644
--- a/vcl/workben/commonfuzzer.hxx
+++ b/vcl/workben/commonfuzzer.hxx
@@ -89,6 +89,7 @@ void CommonInitialize(int *argc, char ***argv)
 {
     setenv("SAL_USE_VCLPLUGIN", "svp", 1);
     setenv("JPEGMEM", "768M", 1);
+    setenv("JSIMD_FORCENONE", "1", 1); // https://github.com/libjpeg-turbo/libjpeg-turbo/issues/253
     setenv("SC_MAX_MATRIX_ELEMENTS", "60000000", 1);
     setenv("SC_NO_THREADED_CALCULATION", "1", 1);
     setenv("SAL_DISABLE_PRINTERLIST", "1", 1);