-
Notifications
You must be signed in to change notification settings - Fork 106
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Pull in a patch from rdesktop CVS, xwin.c rev 1.223.
Fixes a segfault with X11_TYPE=modular. Should fix PR 36443.
- Loading branch information
tnn
committed
Jun 6, 2007
1 parent
2934659
commit e325294
Showing
3 changed files
with
19 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,7 @@ | ||
$NetBSD: distinfo,v 1.16 2006/12/01 10:53:15 hubertf Exp $ | ||
$NetBSD: distinfo,v 1.17 2007/06/06 00:16:35 tnn Exp $ | ||
|
||
SHA1 (rdesktop-1.5.0.tar.gz) = e3086bf865191eed41631813125f482e279c7f3d | ||
RMD160 (rdesktop-1.5.0.tar.gz) = 350e08166d0b7620b4ed9c6594addae7ec53d15a | ||
Size (rdesktop-1.5.0.tar.gz) = 245137 bytes | ||
SHA1 (patch-aa) = dda84f70792828c97aa02567b97d2ae9647b6fcb | ||
SHA1 (patch-ab) = 396a37a4f6f0751e014bd548f9c44f6c462812e1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
$NetBSD: patch-ab,v 1.7 2007/06/06 00:16:35 tnn Exp $ | ||
|
||
http://rdesktop.cvs.sourceforge.net/rdesktop/rdesktop/xwin.c?r1=1.222&r2=1.223&view=patch | ||
|
||
--- xwin.c 2007/01/17 07:39:31 1.222 | ||
+++ xwin.c 2007/04/12 16:04:25 1.223 | ||
@@ -3218,7 +3218,7 @@ | ||
return; | ||
|
||
image = XCreateImage(g_display, g_visual, g_depth, ZPixmap, 0, | ||
- (char *) data, cx, cy, BitmapPad(g_display), cx * g_bpp / 8); | ||
+ (char *) data, cx, cy, g_bpp, 0); | ||
|
||
if (g_ownbackstore) | ||
{ |