rpms/xorg-x11-drv-i810/F-9 intel-stub.c, 1.5, 1.6 xorg-x11-drv-i810.spec, 1.96, 1.97

[Adam Jackson (ajax)]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-i810/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19858

Modified Files:
	intel-stub.c xorg-x11-drv-i810.spec 
Log Message:
* Fri Apr 25 2008 Adam Jackson <ajax at redhat.com> 2.2.1-23
- intel-stub.c: Fix a crash when running without a config file. (#443831)



Index: intel-stub.c
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i810/F-9/intel-stub.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- intel-stub.c	2 Apr 2008 23:27:57 -0000	1.5
+++ intel-stub.c	25 Apr 2008 16:26:55 -0000	1.6
@@ -79,7 +79,7 @@
 		return "intel_batchbuffer";
 
 	xf86ProcessOptions(-1, xf86ConfigLayout.options, stubOptions);
-	if (xf86configptr->conf_flags &&
+	if (xf86configptr && xf86configptr->conf_flags &&
 	    xf86configptr->conf_flags->flg_option_lst)
 		xf86ProcessOptions(-1,
 				   xf86configptr->conf_flags->flg_option_lst,


Index: xorg-x11-drv-i810.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i810/F-9/xorg-x11-drv-i810.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- xorg-x11-drv-i810.spec	23 Apr 2008 18:11:21 -0000	1.96
+++ xorg-x11-drv-i810.spec	25 Apr 2008 16:26:55 -0000	1.97
@@ -6,7 +6,7 @@
 Summary:   Xorg X11 Intel video driver(s)
 Name:      xorg-x11-drv-i810
 Version:   2.2.1
-Release:   22%{?dist}
+Release:   23%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -150,6 +150,9 @@
 %{_libdir}/libIntelXvMC.so
 
 %changelog
+* Fri Apr 25 2008 Adam Jackson <ajax at redhat.com> 2.2.1-23
+- intel-stub.c: Fix a crash when running without a config file. (#443831)
+
 * Wed Apr 23 2008 Adam Jackson <ajax at redhat.com> 2.2.1-22
 - intel-2.2.1-xaa-xv.patch: Fix Xv overlay video to work when using XAA
   and when the compositor is active. (#239125)