From 76e947292e66f56e46b09cffd9b76db794185c8e Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien
Date: Mon, 27 Jul 2009 15:26:29 +0000
Subject: CWS-TOOLING: integrate CWS kso32fixes 2009-07-10 15:25:24 +0200 kso
r273899 : #i53184# - fix probs with UNC server names containing underscores.
2009-07-10 14:31:59 +0200 kso r273893 : CWS-TOOLING: rebase CWS kso32fixes
to trunk@273858 (milestone: DEV300:m52) 2009-07-09 13:46:16 +0200 kso
r273861 : #i53184# - withdrew patch. 2009-07-08 13:39:00 +0200 kso r273829 :
#i63159# - added license header 2009-07-08 11:44:08 +0200 kso r273824 :
i53184 - cannot open files from shell if UNC server has a _ (underscore)
2009-07-08 11:21:12 +0200 kso r273822 : #i93271# - mingw build error
2009-07-08 11:13:48 +0200 kso r273821 : #i91247 - Adhere to one more xdg
spec 2009-07-08 11:02:53 +0200 kso r273820 : #i89017# - osl_trace now emits
trailing line feed to the debugger 2009-07-08 10:55:04 +0200 kso r273819 :
#i88663# - not waiting on successful forks but subsequent process failure
2009-07-07 17:05:27 +0200 kso r273810 : #i88382# - It's nice to leave the
modal mode in gtk+ too ;-) 2009-07-07 16:53:34 +0200 kso r273808 : i88331# -
Typo in include guard 2009-07-07 16:48:17 +0200 kso r273807 : i82831# -
crashrep: warnings when size_t != int 2009-07-07 16:39:49 +0200 kso r273806
: i63159# - Patch to use d_type field in dirent structure if possible
2009-06-24 12:52:27 +0200 kso r273333 : #i100274# - solved win2k missing
symbol problem (again). 2009-05-20 13:58:48 +0200 kso r272124 : CWS-TOOLING:
rebase CWS kso32fixes to trunk@271830 (milestone: DEV300:m48) 2009-04-17
14:50:54 +0200 kso r270950 : CWS-TOOLING: rebase CWS kso32fixes to
trunk@270723 (milestone: DEV300:m46) 2009-03-26 09:27:28 +0100 kso r270054 :
#i100274# NTLM code cleanup. 2009-03-20 14:13:38 +0100 kso r269807 :
#i100274# - Fixed potential buffer overflow in NTLM code. 2009-03-19 14:53:03
+0100 kso r269748 : #i100274. Added NTLM support for Non-Windows platforms.
2009-03-17 15:52:44 +0100 kso r269613 : CWS-TOOLING: rebase CWS kso32fixes
to trunk@269297 (milestone: DEV300:m43)
---
crashrep/source/unx/main.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'crashrep/source')
diff --git a/crashrep/source/unx/main.cxx b/crashrep/source/unx/main.cxx
index 4c043419f9d6..ca24d508ae07 100755
--- a/crashrep/source/unx/main.cxx
+++ b/crashrep/source/unx/main.cxx
@@ -357,7 +357,7 @@ bool SendHTTPRequest(
"SOAPAction: \"\"\r\n\r\n",
pszServer,
uPort,
- (int)length
+ static_cast(length)
);
else
sprintf( buffer,
@@ -365,7 +365,7 @@ bool SendHTTPRequest(
"Content-Type: text/xml; charset=\"utf-8\"\r\n"
"Content-Length: %d\r\n"
"SOAPAction: \"\"\r\n\r\n",
- (int)length
+ static_cast(length)
);
if ( g_bDebugMode )
--
cgit
From 90ed76b32d11ac91a9920105a81c1544718fb193 Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien
Date: Tue, 28 Jul 2009 09:21:19 +0000
Subject: CWS-TOOLING: integrate CWS fwk112 2009-07-17 08:54:15 +0200 cd
r274075 : #i102094# MinGW needs additional path info for linking 2009-07-13
15:09:07 +0200 cd r273938 : #i102094# Add special part for MinGW linking to
imagehlp.lib 2009-07-10 08:05:14 +0200 cd r273871 : #i102094# Use size_t for
constant values to fix warnings 2009-07-09 13:45:27 +0200 cd r273859 :
#i102094# MinGW needs include malloc.h for function alloca 2009-07-09
12:37:39 +0200 cd r273856 : #i102094# Fix problem with signed/unsigned
comparision warning 2009-06-19 11:34:40 +0200 cd r273154 : #i102094# Added
comment for future maintenance 2009-06-19 11:34:11 +0200 cd r273153 :
#i102094# Added comment for future maintenance 2009-06-16 17:25:03 +0200 cd
r273032 : #i102094# Extend md5.cxx to detect Windows PE images and ignore PE
header date+time/checksum to have the same MD5 checksum 2009-06-16 17:22:47
+0200 cd r273031 : #i102094# Added rebase custom action 2009-06-16 17:01:12
+0200 cd r273030 : #i102094# Use rebaseoo.exe instead of rebase.exe to
prevent clash with build tool 2009-06-16 17:00:34 +0200 cd r273029 :
#i102094# Execute rebase custom action for administrative installations
2009-06-16 16:59:11 +0200 cd r273028 : #i102094# Small changes for
rebaseoo/rebasegui tools 2009-06-16 16:58:29 +0200 cd r273027 : i102094#
Deliver rebase tool as rebaseoo.exe as build env already use a rebase.exe
2009-06-16 16:57:15 +0200 cd r273026 : i102094# Crash reporter should not
use PE header date+time/checksum data for MD5 checksum 2009-05-29 17:03:26
+0200 cd r272474 : #i102094# Fix wrong deliver statement 2009-05-29 14:55:35
+0200 cd r272459 : #i102904# Make executables more robust. Add error message
if installation cannot be found 2009-05-28 17:41:07 +0200 cd r272422 :
CWS-TOOLING: rebase CWS fwk112 to trunk@272291 (milestone: DEV300:m49)
2009-05-28 17:31:27 +0200 cd r272421 : #i10000# Resolve conflict on merge
2009-05-28 15:32:09 +0200 cd r272409 : #i102094# Added resource and
localization files for rebasegui tool 2009-05-27 13:56:33 +0200 cd r272341 :
#i102094# Added new command line tool to rebase libraries to a default
virtual load address. Additional GUI tool to check the state of an
installation 2009-05-26 10:49:20 +0200 cd r272285 : #i102094# New command
line tool to rebase libraries to a default virtual load address 2009-05-26
10:40:02 +0200 cd r272282 : #i102094# New command line tool to rebase
libraries to a default virtual load address 2009-05-26 08:57:24 +0200 cd
r272280 : #i102094# Fixed wrong variable usage 2009-05-26 08:41:29 +0200 cd
r272278 : #i102094# New command line tool to rebase libraries to a default
virtual load address 2009-05-20 16:47:24 +0200 cd r272141 : #102094# Added
missing include statement for debug build 2009-05-20 15:39:21 +0200 is
r272136 : #102094# rebase to default value in installation 2009-05-20
15:38:38 +0200 is r272135 : #102094# rebase to default value in installation
2009-05-20 15:37:45 +0200 is r272134 : #102094# rebase to default value in
installation
---
crashrep/source/win32/soreport.cpp | 54 ++++++++++++++++++++++++++++++++++++++
1 file changed, 54 insertions(+)
(limited to 'crashrep/source')
diff --git a/crashrep/source/win32/soreport.cpp b/crashrep/source/win32/soreport.cpp
index 4c897f76e0b5..043ad62b0051 100755
--- a/crashrep/source/win32/soreport.cpp
+++ b/crashrep/source/win32/soreport.cpp
@@ -1564,8 +1564,60 @@ static void repatch_soffice_exe( void *pBuffer, size_t nBufSize )
} while ( !bPatched && nBufSize );
}
+// Normalize executable/library images to prevent different MD5 checksums due
+// to a different PE header date/checksum (this doesn't affect the code/data
+// sections of a executable/library. Please see tools/source/bootstrp/md5.cxx
+// where the same method is also used. The tool so_checksum creates the MD5
+// checksums during build time. You have to make sure that both methods use the
+// same algorithm otherwise there could be problems with stack reports.
+static void normalize_pe_image(sal_uInt8* buffer, size_t nBufferSize)
+{
+ const int OFFSET_PE_OFFSET = 0x3c;
+ const int OFFSET_COFF_TIMEDATESTAMP = 4;
+ const int PE_SIGNATURE_SIZE = 4;
+ const int COFFHEADER_SIZE = 20;
+ const int OFFSET_PE_OPTIONALHEADER_CHECKSUM = 64;
+
+ // Check the header part of the file buffer
+ if (buffer[0] == 'M' && buffer[1] == 'Z')
+ {
+ unsigned long PEHeaderOffset = (long)buffer[OFFSET_PE_OFFSET];
+ if (PEHeaderOffset < nBufferSize-4)
+ {
+ if ( buffer[PEHeaderOffset] == 'P' &&
+ buffer[PEHeaderOffset+1] == 'E' &&
+ buffer[PEHeaderOffset+2] == 0 &&
+ buffer[PEHeaderOffset+3] == 0 )
+ {
+ PEHeaderOffset += PE_SIGNATURE_SIZE;
+ if (PEHeaderOffset+OFFSET_COFF_TIMEDATESTAMP < nBufferSize-4)
+ {
+ // Set timedatestamp and checksum fields to a normalized
+ // value to enforce the same MD5 checksum for identical
+ // Windows executables/libraries.
+ buffer[PEHeaderOffset+OFFSET_COFF_TIMEDATESTAMP] = 0;
+ buffer[PEHeaderOffset+OFFSET_COFF_TIMEDATESTAMP+1] = 0;
+ buffer[PEHeaderOffset+OFFSET_COFF_TIMEDATESTAMP+2] = 0;
+ buffer[PEHeaderOffset+OFFSET_COFF_TIMEDATESTAMP+3] = 0;
+ }
+
+ if (PEHeaderOffset+COFFHEADER_SIZE+OFFSET_PE_OPTIONALHEADER_CHECKSUM < nBufferSize-4)
+ {
+ // Set checksum to a normalized value
+ buffer[PEHeaderOffset+COFFHEADER_SIZE+OFFSET_PE_OPTIONALHEADER_CHECKSUM] = 0;
+ buffer[PEHeaderOffset+COFFHEADER_SIZE+OFFSET_PE_OPTIONALHEADER_CHECKSUM+1] = 0;
+ buffer[PEHeaderOffset+COFFHEADER_SIZE+OFFSET_PE_OPTIONALHEADER_CHECKSUM+2] = 0;
+ buffer[PEHeaderOffset+COFFHEADER_SIZE+OFFSET_PE_OPTIONALHEADER_CHECKSUM+3] = 0;
+ }
+ }
+ }
+ }
+}
+
static sal_uInt32 calc_md5_checksum( const char *filename, sal_uInt8 *pChecksum, sal_uInt32 nChecksumLen )
{
+ const int MINIMAL_FILESIZE = 512;
+
sal_uInt32 nBytesProcessed = 0;
FILE *fp = fopen( filename, "rb" );
@@ -1585,6 +1637,8 @@ static sal_uInt32 calc_md5_checksum( const char *filename, sal_uInt8 *pChecksum
{
if ( 0 == stricmp( GetFileName(filename).c_str(), "soffice.bin" ) )
repatch_soffice_exe( pBuffer, nBytesRead );
+ else if ( nFileSize > MINIMAL_FILESIZE )
+ normalize_pe_image( pBuffer, nBytesRead );
rtlDigestError error = rtl_digest_MD5 (
pBuffer, nBytesRead,
--
cgit
From 46a92e0e2844e9c2fe2111eaac658588ce3ee026 Mon Sep 17 00:00:00 2001
From: Vladimir Glazounov
Date: Wed, 26 Aug 2009 14:24:27 +0000
Subject: CWS-TOOLING: integrate CWS mh132 2009-08-06 12:20:52 +0200 mh
r274712 : corrected error handling 2009-08-05 13:41:20 +0200 mh r274661 :
#i93040# NetBSD compile issue 2009-08-05 13:40:32 +0200 mh r274660 :
#i93040# NetBSD compile issue 2009-08-05 13:38:46 +0200 mh r274659 :
#i93040# NetBSD compile issue 2009-08-05 13:29:15 +0200 mh r274658 :
#i95193# increase includes limit 2009-08-05 13:22:07 +0200 mh r274657 :
#i96811# honor return values of read calls 2009-08-05 13:16:47 +0200 mh
r274654 : #i96802# honor return values of write calls 2009-08-05 13:07:06
+0200 mh r274653 : #i99835# do DestroyData 2009-08-05 13:01:42 +0200 mh
r274651 : #i68557#: allow more dpi resolutions in scanner dialogue 2009-07-24
14:46:04 +0200 mh r274307 : #i103770# missing fclose added
---
crashrep/source/unx/makefile.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'crashrep/source')
diff --git a/crashrep/source/unx/makefile.mk b/crashrep/source/unx/makefile.mk
index 54628be1f2f7..2f8be8f96a76 100755
--- a/crashrep/source/unx/makefile.mk
+++ b/crashrep/source/unx/makefile.mk
@@ -63,7 +63,7 @@ APP1RPATH=BRAND
.IF "$(OS)" != "MACOSX"
APP1STDLIBS=$(DYNAMIC) -lXext -lX11
.ENDIF
-.IF "$(OS)" != "FREEBSD" && "$(OS)" != "MACOSX"
+.IF "$(OS)" != "FREEBSD" && "$(OS)" != "MACOSX" && "$(OS)"!="NETBSD"
APP1STDLIBS+=-ldl -lnsl
.ENDIF
.IF "$(OS)" == "SOLARIS"
--
cgit