[Libreoffice-commits] core.git: 2 commits - sc/source writerfilter/qa

[Caolán McNamara]

 dev/null                                                                 |binary
 sc/source/ui/view/tabvwshb.cxx                                           |    5 +++++
 writerfilter/qa/cppunittests/rtftok/data/pass/CVE-pseudo-2009-0238-1.rtf |binary
 3 files changed, 5 insertions(+)

New commits:
commit bd1be89c1a5fd3457b6bfe8ca78789c047820f17
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Oct 6 16:16:40 2014 +0100

    encrypt sf_508f4e1..rtf to avoid it triggering virus detection
    
    use name CVE-pseudo-2009-0238-1.rtf to record its detected as
    Virus:Trojan.Mdropper and pseudo because its just a fuzzed
    file from some random .rtf and not an original reproducer for
    CVE-2009-0238
    
    Change-Id: I85f6a72e0d32c14ea27cbe03bc4da3c2306fd1f5

diff --git a/writerfilter/qa/cppunittests/rtftok/data/pass/CVE-pseudo-2009-0238-1.rtf b/writerfilter/qa/cppunittests/rtftok/data/pass/CVE-pseudo-2009-0238-1.rtf
new file mode 100644
index 0000000..44ed969
Binary files /dev/null and b/writerfilter/qa/cppunittests/rtftok/data/pass/CVE-pseudo-2009-0238-1.rtf differ
diff --git a/writerfilter/qa/cppunittests/rtftok/data/pass/sf_508f4e169fb76c80745d3541bd01b0a2-73462-minimized.rtf b/writerfilter/qa/cppunittests/rtftok/data/pass/sf_508f4e169fb76c80745d3541bd01b0a2-73462-minimized.rtf
deleted file mode 100644
index e8e27ee..0000000
Binary files a/writerfilter/qa/cppunittests/rtftok/data/pass/sf_508f4e169fb76c80745d3541bd01b0a2-73462-minimized.rtf and /dev/null differ
commit 76d4db3181dfd1524620377bb12a8e0332ae8ab0
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Oct 6 16:00:35 2014 +0100

    Resolves: fdo#80101 inserting non-chart as chart -> unhandled exception
    
    Change-Id: I4d5438292d9a5c49f1336304ebd3dc4e155dd212

diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx
index 289c7e8..5e635b0 100644
--- a/sc/source/ui/view/tabvwshb.cxx
+++ b/sc/source/ui/view/tabvwshb.cxx
@@ -306,6 +306,7 @@ void ScTabViewShell::ExecDrawIns(SfxRequest& rReq)
             break;
 
         case SID_INSERT_DIAGRAM_FROM_FILE:
+            try
             {
                 sfx2::FileDialogHelper aDlg(ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE,
                         0, OUString("com.sun.star.chart2.ChartDocument"));
@@ -316,6 +317,10 @@ void ScTabViewShell::ExecDrawIns(SfxRequest& rReq)
                     FuInsertChartFromFile(this, pWin, pView, pDrModel, rReq, aURL);
                 }
             }
+            catch (const uno::Exception& e)
+            {
+                SAL_WARN( "sc", "Cannot Insert Chart: " << e.Message);
+            }
             break;
 
         case SID_OBJECTRESIZE: