[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - bridges/source scp2/source

[Stephan Bergmann]

 bridges/source/cpp_uno/shared/vtablefactory.cxx |   10 ++++++++--
 scp2/source/ooo/module_hidden_ooo.scp           |    1 -
 scp2/source/python/module_python.scp            |    2 +-
 scp2/source/python/module_python_mailmerge.scp  |    2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)

New commits:
commit e21bbcf27291c30d4888a533beb2d013f456ea14
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Dec 16 09:53:31 2011 +0100

    Fix typo and clean up.
    
    (cherry picked from commit 75d215d47331f816c5d41a34b63badf6e1636ac8)
    
    Conflicts:
    
    	scp2/source/python/module_python_mailmerge.scp

diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index da5775b..024ec68 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -616,7 +616,6 @@ Module gid_Module_Root_Files_6
     gid_File_Share_Registry_Main_Xcd,
     gid_File_Share_Registry_Forcedefault_Xcd,
 	gid_File_Pymailmerge,
-	gid_File_Pymailmerge_msgbox,
     gid_File_Xsl_Common_Measure_Conversion,
 	gid_File_Xsl_Common_Math_Functions,
 	gid_File_Xsl_Export_Common_Body,
diff --git a/scp2/source/python/module_python.scp b/scp2/source/python/module_python.scp
index 32f0dc8..6ee8345 100644
--- a/scp2/source/python/module_python.scp
+++ b/scp2/source/python/module_python.scp
@@ -41,7 +41,7 @@ Module gid_Module_Optional_Pyuno
             gid_Dir_PythonFramework_Versions_ver_lib,
             gid_Dir_PythonFramework_Versions_ver_lib_pythonver,
             gid_Dir_PythonFramework_Versions_ver_lib_pythonver_config);
-    Files = (gid_File_Pyuno,gid_File_Lib_Pyuno,gid_File_Lib_Pythonloader,gid_File_Py_Unohelper,gid_File_Py_Officehelper,gid_File_Py_Uno,gid_File_Py_Pythonloader,gid_File_Py_Python_Core,gid_File_Py_Python_Bin,gid_File_Lib_Python_So,gid_Shortcut_Lib_Python_So,gid_File_Scripts_Python,gid_File_Share_Registry_Pyuno_Xcd);
+    Files = (gid_File_Pyuno,gid_File_Lib_Pyuno,gid_File_Lib_Pythonloader,gid_File_Py_Unohelper,gid_File_Py_Uno,gid_File_Py_Pythonloader,gid_File_Py_Python_Core,gid_File_Py_Python_Bin,gid_File_Lib_Python_So,gid_Shortcut_Lib_Python_So,gid_File_Scripts_Python,gid_File_Share_Registry_Pyuno_Xcd);
     Unixlinks = (gid_Unixlink_Python_Headers,
                  gid_Unixlink_Python_Resources,
                  gid_Unixlink_Python_Versions_Current,
diff --git a/scp2/source/python/module_python_mailmerge.scp b/scp2/source/python/module_python_mailmerge.scp
index d33f982..cf5ad7e 100644
--- a/scp2/source/python/module_python_mailmerge.scp
+++ b/scp2/source/python/module_python_mailmerge.scp
@@ -32,7 +32,7 @@
 File gid_File_Pymailmerge
     TXT_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
-    name = "mailmerge.zip";
+    Name = "mailmerge.zip";
     Styles = (ARCHIVE);
 End
 #endif
commit 908e6a4b7417dfce1adb9fdaccf084ea7d4602ac
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Dec 15 11:57:08 2011 +0100

    Resolves: rhbz#767708 avoid SIGBUS writing to overcommitted mmaped diskspace
    (cherry picked from commit d11f2ccdcecca78bc654ca0b787ea112c1dfe10c)

diff --git a/bridges/source/cpp_uno/shared/vtablefactory.cxx b/bridges/source/cpp_uno/shared/vtablefactory.cxx
index fd84a73..801b16c 100644
--- a/bridges/source/cpp_uno/shared/vtablefactory.cxx
+++ b/bridges/source/cpp_uno/shared/vtablefactory.cxx
@@ -40,6 +40,7 @@
 #include "osl/mutex.hxx"
 #include "rtl/alloc.h"
 #include "rtl/ustring.hxx"
+#include "sal/log.hxx"
 #include "sal/types.h"
 #include "typelib/typedescription.hxx"
 
@@ -65,6 +66,10 @@
 #error Unsupported platform
 #endif
 
+#if defined USE_DOUBLE_MMAP
+#include <fcntl.h>
+#endif
+
 using bridges::cpp_uno::shared::VtableFactory;
 
 namespace {
@@ -259,9 +264,10 @@ bool VtableFactory::createBlock(Block &block, sal_Int32 slotCount) const
         }
         unlink(tmpfname);
         delete[] tmpfname;
-        if (ftruncate(block.fd, block.size) == -1)
+        int err = posix_fallocate(block.fd, 0, block.size);
+        if (err != 0)
         {
-            perror("truncation of executable memory area failed");
+            SAL_WARN("bridges", "posix_fallocate failed with code " << err);
             close(block.fd);
             block.fd = -1;
             break;