[Libreoffice-commits] core.git: 3 commits - hwpfilter/source lotuswordpro/source vcl/workben

Caolán McNamara caolanm at redhat.com
Mon Mar 20 15:52:23 UTC 2017


 hwpfilter/source/hwpreader.cxx           |   31 ++++++++++++++++-----------
 lotuswordpro/source/filter/lwpfilter.cxx |    3 --
 vcl/workben/commonfuzzer.hxx             |    2 -
 vcl/workben/fftester.cxx                 |   35 -------------------------------
 4 files changed, 22 insertions(+), 49 deletions(-)

New commits:
commit 2ee7ad015147de33c172677b70a120f45f2e794f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Mar 20 15:51:38 2017 +0000

    Resolves: ofz#820 an exception is an acceptable outcome
    
    Change-Id: Ifc5be483387202c371596fd52f1e2ce682151ca8

diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx
index cf1dbd452d16..cf13db054a50 100644
--- a/hwpfilter/source/hwpreader.cxx
+++ b/hwpfilter/source/hwpreader.cxx
@@ -118,21 +118,28 @@ HwpReader::~HwpReader()
 
 extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportHWP(SvStream &rStream)
 {
-    std::unique_ptr<HStream> stream(new HStream);
-    byte aData[32768];
-    std::size_t nRead, nBlock = 32768;
+    try
+    {
+        std::unique_ptr<HStream> stream(new HStream);
+        byte aData[32768];
+        std::size_t nRead, nBlock = 32768;
+
+        while (true)
+        {
+            nRead = rStream.ReadBytes(aData, nBlock);
+            if (nRead == 0)
+                break;
+            stream->addData(aData, (int)nRead);
+        }
 
-    while (true)
+        HWPFile hwpfile;
+        if (hwpfile.ReadHwpFile(stream.release()))
+            return false;
+    }
+    catch (...)
     {
-        nRead = rStream.ReadBytes(aData, nBlock);
-        if (nRead == 0)
-            break;
-        stream->addData(aData, (int)nRead);
+        return false;
     }
-
-    HWPFile hwpfile;
-    if (hwpfile.ReadHwpFile(stream.release()))
-          return false;
     return true;
 }
 
diff --git a/lotuswordpro/source/filter/lwpfilter.cxx b/lotuswordpro/source/filter/lwpfilter.cxx
index 8f8c8a365209..cfa6b42ff405 100644
--- a/lotuswordpro/source/filter/lwpfilter.cxx
+++ b/lotuswordpro/source/filter/lwpfilter.cxx
@@ -215,13 +215,12 @@ int ReadWordproFile(SvStream &rStream, uno::Reference<css::xml::sax::XDocumentHa
         //Reset all static objects,because this function may be called many times.
         XFGlobalReset();
         reader.Read();
-
-        return 0;
     }
     catch (...)
     {
         return 1;
     }
+    return 0;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit d31cdf523cf83f62280aa288765ffc2c1457f066
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Mar 20 15:41:02 2017 +0000

    ofz: reduce jpeg mem limit by 1/4
    
    Change-Id: I136cca9465debc4bc26e2173f050eb253de1a698

diff --git a/vcl/workben/commonfuzzer.hxx b/vcl/workben/commonfuzzer.hxx
index f268c2973a7e..4357476efc9f 100644
--- a/vcl/workben/commonfuzzer.hxx
+++ b/vcl/workben/commonfuzzer.hxx
@@ -78,7 +78,7 @@ extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv)
         __lsan_disable();
 
     setenv("SAL_USE_VCLPLUGIN", "svp", 1);
-    setenv("JPEGMEM", "1024M", 1);
+    setenv("JPEGMEM", "768M", 1);
     setenv("SAL_WMF_COMPLEXCLIP_VIA_REGION", "1", 1);
     setenv("SAL_DISABLE_PRINTERLIST", "1", 1);
     setenv("SAL_NO_FONT_LOOKUP", "1", 1);
diff --git a/vcl/workben/fftester.cxx b/vcl/workben/fftester.cxx
index 313e20ce69c5..3611a9dd8275 100644
--- a/vcl/workben/fftester.cxx
+++ b/vcl/workben/fftester.cxx
@@ -102,7 +102,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
         utl::ConfigManager::EnableAvoidConfig();
         InitVCL();
 
-        setenv("JPEGMEM", "1024M", 1);
+        setenv("JPEGMEM", "768M", 1);
         setenv("SAL_WMF_COMPLEXCLIP_VIA_REGION", "1", 1);
         setenv("SAL_DISABLE_PRINTERLIST", "1", 1);
         setenv("SAL_NO_FONT_LOOKUP", "1", 1);
commit c03949d4fa6a05ad746061a49086084fef648a71
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Mar 20 15:38:18 2017 +0000

    BitmapEx::Convert testing has served its purpose
    
    Change-Id: Ib4bce41b07dd1bbf97a7cd9b0a64132b915998ab

diff --git a/vcl/workben/fftester.cxx b/vcl/workben/fftester.cxx
index a12f3cb2b06a..313e20ce69c5 100644
--- a/vcl/workben/fftester.cxx
+++ b/vcl/workben/fftester.cxx
@@ -123,46 +123,35 @@ try_again:
                 Graphic aGraphic;
                 SvFileStream aFileStream(out, StreamMode::READ);
                 ret = (int) ImportJPEG(aFileStream, aGraphic, nullptr, GraphicFilterImportFlags::NONE);
-                BitmapEx aTarget = aGraphic.GetBitmapEx();
-                aTarget.Convert(BmpConversion::N24Bit);
             }
             else if (strcmp(argv[2], "gif") == 0)
             {
                 SvFileStream aFileStream(out, StreamMode::READ);
                 Graphic aGraphic;
                 ret = (int) ImportGIF(aFileStream, aGraphic);
-                BitmapEx aTarget = aGraphic.GetBitmapEx();
-                aTarget.Convert(BmpConversion::N24Bit);
             }
             else if (strcmp(argv[2], "xbm") == 0)
             {
                 Graphic aGraphic;
                 SvFileStream aFileStream(out, StreamMode::READ);
                 ret = (int) ImportXBM(aFileStream, aGraphic);
-                BitmapEx aTarget = aGraphic.GetBitmapEx();
-                aTarget.Convert(BmpConversion::N24Bit);
             }
             else if (strcmp(argv[2], "xpm") == 0)
             {
                 Graphic aGraphic;
                 SvFileStream aFileStream(out, StreamMode::READ);
                 ret = (int) ImportXPM(aFileStream, aGraphic);
-                BitmapEx aTarget = aGraphic.GetBitmapEx();
-                aTarget.Convert(BmpConversion::N24Bit);
             }
             else if (strcmp(argv[2], "png") == 0)
             {
                 SvFileStream aFileStream(out, StreamMode::READ);
                 vcl::PNGReader aReader(aFileStream);
-                BitmapEx aTarget = aReader.Read();
-                aTarget.Convert(BmpConversion::N24Bit);
             }
             else if (strcmp(argv[2], "bmp") == 0)
             {
                 Bitmap aTarget;
                 SvFileStream aFileStream(out, StreamMode::READ);
                 ret = (int) ReadDIB(aTarget, aFileStream, true);
-                aTarget.Convert(BmpConversion::N24Bit);
             }
             else if (strcmp(argv[2], "svm") == 0)
             {
@@ -185,8 +174,6 @@ try_again:
                 Graphic aGraphic;
                 SvFileStream aFileStream(out, StreamMode::READ);
                 ret = (int) (*pfnImport)(aFileStream, aGraphic, nullptr);
-                BitmapEx aTarget = aGraphic.GetBitmapEx();
-                aTarget.Convert(BmpConversion::N24Bit);
             }
             else if (strcmp(argv[2], "dxf") == 0)
             {
@@ -202,8 +189,6 @@ try_again:
                 Graphic aGraphic;
                 SvFileStream aFileStream(out, StreamMode::READ);
                 ret = (int) (*pfnImport)(aFileStream, aGraphic, nullptr);
-                BitmapEx aTarget = aGraphic.GetBitmapEx();
-                aTarget.Convert(BmpConversion::N24Bit);
             }
             else if (strcmp(argv[2], "met") == 0)
             {
@@ -219,8 +204,6 @@ try_again:
                 Graphic aGraphic;
                 SvFileStream aFileStream(out, StreamMode::READ);
                 ret = (int) (*pfnImport)(aFileStream, aGraphic, nullptr);
-                BitmapEx aTarget = aGraphic.GetBitmapEx();
-                aTarget.Convert(BmpConversion::N24Bit);
             }
             else if ((strcmp(argv[2], "pbm") == 0) || strcmp(argv[2], "ppm") == 0)
             {
@@ -236,8 +219,6 @@ try_again:
                 Graphic aGraphic;
                 SvFileStream aFileStream(out, StreamMode::READ);
                 ret = (int) (*pfnImport)(aFileStream, aGraphic, nullptr);
-                BitmapEx aTarget = aGraphic.GetBitmapEx();
-                aTarget.Convert(BmpConversion::N24Bit);
             }
             else if (strcmp(argv[2], "psd") == 0)
             {
@@ -253,8 +234,6 @@ try_again:
                 Graphic aGraphic;
                 SvFileStream aFileStream(out, StreamMode::READ);
                 ret = (int) (*pfnImport)(aFileStream, aGraphic, nullptr);
-                BitmapEx aTarget = aGraphic.GetBitmapEx();
-                aTarget.Convert(BmpConversion::N24Bit);
             }
             else if (strcmp(argv[2], "eps") == 0)
             {
@@ -270,8 +249,6 @@ try_again:
                 Graphic aGraphic;
                 SvFileStream aFileStream(out, StreamMode::READ);
                 ret = (int) (*pfnImport)(aFileStream, aGraphic, nullptr);
-                BitmapEx aTarget = aGraphic.GetBitmapEx();
-                aTarget.Convert(BmpConversion::N24Bit);
             }
             else if (strcmp(argv[2], "pct") == 0)
             {
@@ -287,8 +264,6 @@ try_again:
                 Graphic aGraphic;
                 SvFileStream aFileStream(out, StreamMode::READ);
                 ret = (int) (*pfnImport)(aFileStream, aGraphic, nullptr);
-                BitmapEx aTarget = aGraphic.GetBitmapEx();
-                aTarget.Convert(BmpConversion::N24Bit);
             }
             else if (strcmp(argv[2], "pcx") == 0)
             {
@@ -304,8 +279,6 @@ try_again:
                 Graphic aGraphic;
                 SvFileStream aFileStream(out, StreamMode::READ);
                 ret = (int) (*pfnImport)(aFileStream, aGraphic, nullptr);
-                BitmapEx aTarget = aGraphic.GetBitmapEx();
-                aTarget.Convert(BmpConversion::N24Bit);
             }
             else if (strcmp(argv[2], "ras") == 0)
             {
@@ -321,8 +294,6 @@ try_again:
                 Graphic aGraphic;
                 SvFileStream aFileStream(out, StreamMode::READ);
                 ret = (int) (*pfnImport)(aFileStream, aGraphic, nullptr);
-                BitmapEx aTarget = aGraphic.GetBitmapEx();
-                aTarget.Convert(BmpConversion::N24Bit);
             }
             else if (strcmp(argv[2], "tga") == 0)
             {
@@ -338,8 +309,6 @@ try_again:
                 Graphic aGraphic;
                 SvFileStream aFileStream(out, StreamMode::READ);
                 ret = (int) (*pfnImport)(aFileStream, aGraphic, nullptr);
-                BitmapEx aTarget = aGraphic.GetBitmapEx();
-                aTarget.Convert(BmpConversion::N24Bit);
             }
             else if (strcmp(argv[2], "tif") == 0)
             {
@@ -355,8 +324,6 @@ try_again:
                 Graphic aGraphic;
                 SvFileStream aFileStream(out, StreamMode::READ);
                 ret = (int) (*pfnImport)(aFileStream, aGraphic, nullptr);
-                BitmapEx aTarget = aGraphic.GetBitmapEx();
-                aTarget.Convert(BmpConversion::N24Bit);
             }
             else if ( (strcmp(argv[2], "doc") == 0) ||
                       (strcmp(argv[2], "ww8") == 0) ||


More information about the Libreoffice-commits mailing list