Hello community, here is the log from the commit of package xorg-x11-server checked in at Tue Nov 28 17:19:38 CET 2006. -------- --- xorg-x11-server/xorg-x11-server.changes 2006-11-20 22:01:32.000000000 +0100 +++ /mounts/work_src_done/STABLE/STABLE/xorg-x11-server/xorg-x11-server.changes 2006-11-28 15:46:14.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Nov 28 15:45:20 CET 2006 - sndirsch@suse.de + +- xserver-timers.diff: + * fix null pointer reference in timer code (Bug #223718) + +------------------------------------------------------------------- New: ---- xserver-timers.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-server.spec ++++++ --- /var/tmp/diff_new_pack.7F5IUt/_old 2006-11-28 17:16:23.000000000 +0100 +++ /var/tmp/diff_new_pack.7F5IUt/_new 2006-11-28 17:16:23.000000000 +0100 @@ -17,7 +17,7 @@ URL: http://xorg.freedesktop.org/ %define EXPERIMENTAL 0 Version: 7.2 -Release: 26 +Release: 28 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -67,6 +67,7 @@ Patch31: mouse-fix.diff Patch32: acpi_events.diff Patch33: p_pci-off-by-one.diff +Patch34: xserver-timers.diff Patch334: p_pci-domain.diff Patch357: p_pci-ce-x.diff @@ -136,6 +137,7 @@ %patch31 -p1 %patch32 -p1 %patch33 -p0 +%patch34 -p1 %build autoreconf -fi @@ -440,6 +442,9 @@ %endif %changelog -n xorg-x11-server +* Tue Nov 28 2006 - sndirsch@suse.de +- xserver-timers.diff: + * fix null pointer reference in timer code (Bug #223718) * Mon Nov 20 2006 - sndirsch@suse.de - p_pci-off-by-one.diff: * readded off by one fix, which has been dropped by accident ++++++ xserver-timers.diff ++++++ diff --git a/os/WaitFor.c b/os/WaitFor.c index 6109e34..8b01e2c 100644 --- a/os/WaitFor.c +++ b/os/WaitFor.c @@ -205,15 +205,17 @@ WaitForSomething(int *pClientsReady) if (timeout > 0 && timeout > timers->delta + 250) { /* time has rewound. reset the timers. */ CheckAllTimers(now); - timeout = timers->expires - now; } - if (timeout < 0) - timeout = 0; - waittime.tv_sec = timeout / MILLI_PER_SECOND; - waittime.tv_usec = (timeout % MILLI_PER_SECOND) * - (1000000 / MILLI_PER_SECOND); - wt = &waittime; + if (timers) { + timeout = timers->expires - now; + if (timeout < 0) + timeout = 0; + waittime.tv_sec = timeout / MILLI_PER_SECOND; + waittime.tv_usec = (timeout % MILLI_PER_SECOND) * + (1000000 / MILLI_PER_SECOND); + wt = &waittime; + } } XFD_COPYSET(&AllSockets, &LastSelectMask); #ifdef SMART_SCHEDULE ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org