|
From: <ge...@us...> - 2010-11-20 12:20:46
|
Revision: 7434
http://winmerge.svn.sourceforge.net/winmerge/?rev=7434&view=rev
Author: gerundt
Date: 2010-11-20 12:20:37 +0000 (Sat, 20 Nov 2010)
Log Message:
-----------
PATCH: [ 3109525 ] Crash when pasting from clipboard
Submitted by Lars Wittenburg
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Docs/Users/Contributors.txt
trunk/Src/editlib/ccrystaltextview2.cpp
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2010-11-20 11:52:43 UTC (rev 7433)
+++ trunk/Docs/Users/ChangeLog.txt 2010-11-20 12:20:37 UTC (rev 7434)
@@ -9,6 +9,7 @@
Installer: Don't install quick launch icon for Windows 7 (#3079966)
Installer: Add OpenCandy to the InnoSetup installer (#3088720)
Bugfix: No menu icons was shown on Windows x64 (#3070151)
+ Bugfix: Crash when pasting from clipboard (#3109525)
Translation updates:
- Bulgarian (#3082392)
Modified: trunk/Docs/Users/Contributors.txt
===================================================================
--- trunk/Docs/Users/Contributors.txt 2010-11-20 11:52:43 UTC (rev 7433)
+++ trunk/Docs/Users/Contributors.txt 2010-11-20 12:20:37 UTC (rev 7434)
@@ -182,6 +182,7 @@
* Vikrant
* Gilbert Wellisch
* Paul Welter
+* Lars Wittenburg
WinMerge includes code from:
Modified: trunk/Src/editlib/ccrystaltextview2.cpp
===================================================================
--- trunk/Src/editlib/ccrystaltextview2.cpp 2010-11-20 11:52:43 UTC (rev 7433)
+++ trunk/Src/editlib/ccrystaltextview2.cpp 2010-11-20 12:20:37 UTC (rev 7434)
@@ -1166,7 +1166,8 @@
if (pszData != NULL)
{
UINT cbData = (UINT) GlobalSize (hData);
- int cchText = cbData / sizeof(TCHAR) - 1;
+ // in case we get an odd length for unicodes
+ int cchText = ((cbData + 1) / sizeof(TCHAR)) - 1;
if (cchText >= 0)
memcpy(text.GetBufferSetLength(cchText), pszData, cbData);
GlobalUnlock (hData);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
