rpms/dx/F-11 dx-null.patch,NONE,1.1 dx.spec,1.15,1.16

[Dominik Mierzejewski]

Author: rathann

Update of /cvs/pkgs/rpms/dx/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5153

Modified Files:
	dx.spec 
Added Files:
	dx-null.patch 
Log Message:
- fix NULL pointer dereference when running dxexec over ssh
  without X forwarding


dx-null.patch:
 xwindow.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE dx-null.patch ---
diff -up dx-4.4.4/src/exec/libdx/xwindow.c.null dx-4.4.4/src/exec/libdx/xwindow.c
--- dx-4.4.4/src/exec/libdx/xwindow.c.null	2000-06-12 07:45:40.000000000 +0200
+++ dx-4.4.4/src/exec/libdx/xwindow.c	2009-11-08 15:10:13.000000000 +0100
@@ -29,7 +29,9 @@ Error
 DXRegisterWindowHandlerWithCheckProc(Error (*proc) (int, Pointer),
 		int (*check)(int, Pointer), Display *d, Pointer arg)
 {
-    int fd = ConnectionNumber(d);
+    int fd;
+    if (d) fd = ConnectionNumber(d);
+    else return ERROR;
 
     if (! DXRegisterInputHandlerWithCheckProc(proc, check, fd, arg))
 	return ERROR;


Index: dx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dx/F-11/dx.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- dx.spec	6 Nov 2009 15:56:43 -0000	1.15
+++ dx.spec	8 Nov 2009 14:57:01 -0000	1.16
@@ -11,6 +11,9 @@ Patch1: %{name}-open.patch
 Patch2: %{name}-gcc43.patch
 # fixes http://www.opendx.org/bugs/view.php?id=236
 Patch3: %{name}-errno.patch
+# fix NULL pointer dereference when running dxexec over ssh
+# without X forwarding
+Patch4: %{name}-null.patch
 License: IBM
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: bison
@@ -60,6 +63,7 @@ Editor, or in the scripting language, yo
 %patch1 -p1 -b .open
 %patch2 -p1 -b .gcc43
 %patch3 -p1 -b .errno
+%patch4 -p1 -b .null
 # fix debuginfo rpmlint warnings
 chmod a-x src/exec/{dxmods,dpexec,hwrender}/*.{c,h}
 
@@ -128,6 +132,8 @@ rm -rf $RPM_BUILD_ROOT
 - updated source URL
 - fix build afainst new netcdf headers location
 - fix build against new ImageMagick
+- fix NULL pointer dereference when running dxexec over ssh
+  without X forwarding
 
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.4.4-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild