Index: src/Changelog.txt
===================================================================
--- src/Changelog.txt (revision 7346)
+++ src/Changelog.txt (working copy)
@@ -4,6 +4,8 @@
instead of HEAD. See issue #258 for details. (Stefan)
- CHG: When copying selected lines to the clipboard, a newline is added
at the end of the last line. See issue #272 for details. (Stefan)
+- CHG: CrashRpt.dll is now loaded with an absolute path. This prevents
+ TSVN from loading an arbitrary DLL. (Tobias Schäfer)
Version 1.4.0
- NEW: Allow changing the alpha value in overlapped mode in TortoiseIDiff
Index: src/crashrpt/CrashReport.h
===================================================================
--- src/crashrpt/CrashReport.h (revision 7345)
+++ src/crashrpt/CrashReport.h (working copy)
@@ -1,5 +1,7 @@
#pragma once
+#include "registry.h"
+
// Client crash callback
typedef BOOL (CALLBACK *LPGETLOGFILE) (LPVOID lpvState);
// Stack trace callback
@@ -73,7 +75,8 @@
CCrashReport(LPCSTR lpTo = NULL, LPCSTR lpSubject = NULL, BOOL bUseUI = TRUE)
{
InstallEx pfnInstallEx;
- m_hDll = LoadLibrary(_T("CrashRpt.dll"));
+ CString strFilename = CRegString(_T("Software\\TortoiseSVN\\CrashReportPath"), _T("CrashRpt.dll"), false, HKEY_LOCAL_MACHINE);
+ m_hDll = LoadLibrary(strFilename);
if (m_hDll)
{
pfnInstallEx = (InstallEx)GetProcAddress(m_hDll, "InstallEx");
Index: src/TortoiseSVNSetup/StructureFragment.wxs
===================================================================
--- src/TortoiseSVNSetup/StructureFragment.wxs (revision 7345)
+++ src/TortoiseSVNSetup/StructureFragment.wxs (working copy)
@@ -125,6 +125,7 @@
+