[Libreoffice-commits] .: 4 commits - .gitignore sal/osl solenv/gbuild solenv/inc

[Tor Lillqvist]

 .gitignore                        |    7 +++++++
 sal/osl/w32/security.c            |    4 ++--
 solenv/gbuild/platform/windows.mk |   12 ------------
 solenv/inc/wntmsc.mk              |    1 +
 4 files changed, 10 insertions(+), 14 deletions(-)

New commits:
commit ff7ee4a7fbc85b3bdd36bb18598b013204ab9b3a
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Aug 16 10:18:09 2011 +0300

    Fix heap corruption (malloc buffer overrun)
    
    Detected by the debug C runtime (when using --enable-dbgutil) when
    running a unit test.

diff --git a/sal/osl/w32/security.c b/sal/osl/w32/security.c
index 56ca562..053d39f 100644
--- a/sal/osl/w32/security.c
+++ b/sal/osl/w32/security.c
@@ -164,8 +164,8 @@ oslSecurityError SAL_CALL osl_loginUserOnFileServer(rtl_uString *strUserName,
     sal_Unicode*                remoteName;
     sal_Unicode*                userName;
 
-    remoteName  = malloc(rtl_uString_getLength(strFileServer) + rtl_uString_getLength(strUserName) + 4);
-    userName    = malloc(rtl_uString_getLength(strFileServer) + rtl_uString_getLength(strUserName) + 2);
+    remoteName  = malloc((rtl_uString_getLength(strFileServer) + rtl_uString_getLength(strUserName) + 4) * sizeof(sal_Unicode));
+    userName    = malloc((rtl_uString_getLength(strFileServer) + rtl_uString_getLength(strUserName) + 2) * sizeof(sal_Unicode));
 
     wcscpy(remoteName, L"\\\\");
     wcscat(remoteName, rtl_uString_getStr(strFileServer));
commit 247d3ff1421967f523b575f20e31bc8e8bdf5bc6
Author: Korrawit Pruegsanusak <detective.conan.1412 at gmail.com>
Date:   Sun Aug 14 01:05:10 2011 +0700

    Remove duplicated chunk

diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index e9057f4..2ffeacb 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -260,18 +260,6 @@ $(patsubst $(SRCDIR)%,$(gb_Helper_SRCDIR_NATIVE)%, \
 $(1)))))
 endef
 
-# convert parameters filesystem root to native notation
-# does some real work only on windows, make sure not to
-# break the dummy implementations on unx*
-define gb_Helper_convert_native
-$(patsubst -I$(OUTDIR)%,-I$(gb_Helper_OUTDIR_NATIVE)%, \
-$(patsubst $(OUTDIR)%,$(gb_Helper_OUTDIR_NATIVE)%, \
-$(patsubst $(WORKDIR)%,$(gb_Helper_WORKDIR_NATIVE)%, \
-$(patsubst $(SRCDIR)%,$(gb_Helper_SRCDIR_NATIVE)%, \
-$(1)))))
-endef
-
-
 # CObject class
 
 define gb_CObject__command
commit 1522aaf2dd86ca7aa3d79c949ceb92fc8b8fe06c
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Aug 16 09:56:42 2011 +0300

    Fix --enable-dbgutil build: Define _DEBUG

diff --git a/solenv/inc/wntmsc.mk b/solenv/inc/wntmsc.mk
index e09b398..41c1ea5 100644
--- a/solenv/inc/wntmsc.mk
+++ b/solenv/inc/wntmsc.mk
@@ -282,6 +282,7 @@ UWINAPILIB*=uwinapi.lib
 .IF "$(USE_DEBUG_RUNTIME)" != ""
 LIBCMT=msvcrtd.lib
 LIBCPMT=msvcprtd.lib
+CDEFS+=-D_DEBUG
 .ELSE  # "$(USE_DEBUG_RUNTIME)" != ""
 LIBCMT=msvcrt.lib
 LIBCPMT=msvcprt.lib
commit 6034e6aac0daf12b7bb52122cef8dc27d9d2bbb4
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Aug 15 19:55:37 2011 +0300

    Add the external dlls, exes etc

diff --git a/.gitignore b/.gitignore
index a3503ad..ee39955 100644
--- a/.gitignore
+++ b/.gitignore
@@ -71,6 +71,13 @@
 
 /*/*.exe
 
+# external dlls etc
+/external/*/*.dll
+/external/*/*.exe
+/external/*/*.manifest
+/external/*/*.txt
+/moz/zipped/*.zip
+
 # links to the other repositories
 /binfilter
 /dictionaries