Commit Graph

4105 Commits

Author SHA1 Message Date
Jeremy Huddleston
aac6869c53 1.4.2-apple1 2008-06-11 11:28:40 -07:00
Jeremy Huddleston
69605654ba Merge commit 'origin/server-1.4-branch' into xorg-server-1.4-apple 2008-06-11 11:28:16 -07:00
Julien Cristau
c3a7903f6a Bump to 1.4.2
And update release date.
2008-06-11 16:27:40 +02:00
Jeremy Huddleston
871ebd95fc 1.4.1-apple1
Something slightly perfecter
2008-06-10 10:50:18 -07:00
Jeremy Huddleston
78e98f9cc4 Merge commit 'origin/server-1.4-branch' into xorg-server-1.4-apple 2008-06-10 10:49:06 -07:00
Jeremy Huddleston
a9ee6b0d00 XQuartz: Removed code path for old startup 2008-06-10 10:47:37 -07:00
Matthieu Herrb
08e6292e7e CVE-2008-1379 - MIT-SHM arbitrary memory read
An integer overflow in the validation of the parameters of the
ShmPutImage() request makes it possible to trigger the copy of
arbitrary server memory to a pixmap that can subsequently be read by
the client, to read arbitrary parts of the X server memory space.
2008-06-10 11:43:43 -06:00
Matthieu Herrb
8ffaf61370 CVE-2008-1377 - RECORD and Security extensions memory corruption
Lack of validation of the parameters of the
SProcSecurityGenerateAuthorization SProcRecordCreateContext
functions makes it possible for a specially crafted request to trigger
the swapping of bytes outside the parameter of these requests, causing
memory corruption.
2008-06-10 11:43:35 -06:00
Matthieu Herrb
702e709973 CVE-2008-2362 - RENDER Extension memory corruption
Integer overflows can occur in the code validating the parameters for
the SProcRenderCreateLinearGradient, SProcRenderCreateRadialGradient
and SProcRenderCreateConicalGradient functions, leading to memory
corruption by swapping bytes outside of the intended request
parameters.
2008-06-10 11:43:27 -06:00
Matthieu Herrb
c4937bbb69 CVE-2008-2361 - RENDER Extension crash
An integer overflow may occur in the computation of the
size of the  glyph to be allocated by the ProcRenderCreateCursor()
function  which will cause less memory to be allocated than expected,
leading later to dereferencing  un-mapped memory, causing a crash of
the X server.
2008-06-10 11:42:35 -06:00
Matthieu Herrb
b1a4a96885 CVE-2008-2360 - RENDER Extension heap buffer overflow
An integer overflow may occur in the computation of the size of the
glyph to be allocated by the AllocateGlyph() function which will cause
less memory to be allocated than expected, leading to later heap
overflow.

On systems where the X  SIGSEGV handler includes a stack trace, more
malloc()-type functions are called, which may lead to other
exploitable issues.
2008-06-10 11:42:27 -06:00
Daniel Stone
43285b4f72 Bump to 1.4.1
Whatever.  It doesn't have to be perfect.
2008-06-10 18:36:38 +03:00
Daniel Stone
4d59afd613 Xi: event_{x,y} should refer to the extended device (bug #16289)
ProcessOtherEvents was unconditionally stomping the root_{x,y}
co-ordinates provided by GetPointerEvents with those of the core
pointer, meaning that both root_{x,y} and event_{x,y} reported to
clients would reflect the sprite's position, not the position reported
by the device that generated the DeviceMotionNotify or the
DeviceButton{Press,Release} event in the first place.

For key events we still take the sprite's co-ords, as we're delivering
to the focus, which is the (VCP) sprite.

Not cherry-picked from master as MPX fixes this anyway, by taking the
co-ords of the sprite the device moves (be it visible or no).
(cherry picked from commit 8259d19f71)
2008-06-10 18:34:18 +03:00
Jeremy Huddleston
4505bae5d7 XQuartz: Under the new startup model, we no longer need to do the foreground/background dance. 2008-06-10 02:15:25 -07:00
Jeremy Huddleston
ee92aced10 XQuartz: Fixed the "laggy" startup under the new model. This was caused by xinit blocking expecting SIGUSR1 and our stub never sending it. 2008-06-10 01:39:15 -07:00
Jeremy Huddleston
d8cf5623fa XQuartz: Updated icon with more rsolutions and made it more dark-background friendly 2008-06-04 18:28:20 -07:00
Jeremy Huddleston
d3cd7b4ed2 1.4.0-apple14 2008-06-04 12:21:28 -07:00
Jeremy Huddleston
c407bae5b8 Merge commit 'origin/server-1.4-branch' into xorg-server-1.4-apple 2008-06-04 12:20:35 -07:00
Jeremy Huddleston
7812a8bdf9 XQuartz: Removed async debugging sleep 2008-06-04 12:19:28 -07:00
Jeremy Huddleston
ff1c443cad XQuartz: use a condition variable to signal when darwinEvents is ready rather than polling 2008-06-04 12:01:19 -07:00
Jeremy Huddleston
c3558bb8cd XQuartz: Don't forget to destroy the mutex and cond after we're done with them 2008-06-04 11:35:24 -07:00
Jeremy Huddleston
dd0f8a0f59 XQuartz: Fork for trigger 2008-06-04 11:18:52 -07:00
Jeremy Huddleston
7f840e9dc1 XQuartz: Switched over to new startup path for testing. Cleaned it up a bit. Server still crashes when using the icon to launch =/ 2008-06-03 00:06:26 -07:00
Sascha Hlusiak
7982aaa7f0 Fix getValuatorEvents to compute number of valuators correctly. 2008-05-30 19:38:49 +02:00
Jeremy Huddleston
87b027bb59 1.4.0-apple13 2008-05-23 02:28:13 -07:00
Jeremy Huddleston
2bb4251b3c XQuartz: A 2 second delay for launchd socket connections should be sufficient. 2008-05-23 02:27:58 -07:00
Jeremy Huddleston
83f7252939 XQuartz: Add the launchd fd to AllSockets as well 2008-05-23 02:10:14 -07:00
Jeremy Huddleston
36db2ace75 1.4.0-apple12 2008-05-23 01:42:51 -07:00
Jeremy Huddleston
1e1f4fb717 XQuartz: Don't need launchd checking in configure.ac anymore since its functionality has been removed from libxtrans and into the mach startup code. 2008-05-23 01:42:24 -07:00
Jeremy Huddleston
c3866c98d2 XQuartz: Move the launchd display grabbing into mach_startup 2008-05-23 01:39:02 -07:00
Jeremy Huddleston
7dd3512715 XQuartz: Fixed a few issues with fd passing... still not working =( 2008-05-19 03:13:09 -07:00
Jeremy Huddleston
cccee9cfc2 XQuartz: First stab at SCM_RIGHTS passing the $DISPLAY launchd fd from the stub to server 2008-05-19 02:45:47 -07:00
Jeremy Huddleston
2a72309c06 XQuartz: Fixed dropped code in the !XKB blocks, disable XKB support until we figure out a solution for xkeyboard-config 2008-05-18 23:51:06 -07:00
Jeremy Huddleston
6fb587d3d5 XQuartz: Cleaned up ListenOnOpenFD... 2008-05-18 23:31:41 -07:00
Jeremy Huddleston
c27e0c8f3c New XQuartz icon thanks to Simone Karin Lehmann 2008-05-18 23:02:12 -07:00
Jeremy Huddleston
632ea62166 Merge branch 'server-1.4-branch' into xorg-server-1.4-apple 2008-05-17 14:55:57 -07:00
Jeremy Huddleston
301262b070 XQuartz: Ok, pass XQUARTZ_USE_XKB since it breaks worse without it... but we have issues when we have the keyboard configs installed... need to figure out what to do there... 2008-05-17 14:51:09 -07:00
Peter Hutterer
ddcca23a81 xkb: when copying the keymap, make sure the structs default to 0/NULL.
It actually does help if a pointer is NULL rather than pointing to nirvana
when you're trying to free it lateron. Who would have thought?
(cherry picked from commit 7a97ca667405a42d008265c3a870210cc1da97dd)
(cherry picked from commit 0b0a097973)
2008-05-17 15:12:38 +02:00
Mart Raudsepp
4e5cf76eca xf86: Add AutoConfig driver for PCI ID 1022:2081 to 'amd'
(cherry picked from commit ab9b0b36ac)
(cherry picked from commit 4fa89fbe18)
... and backported to 1.4 (back to no new devprivates and "amd" driver name)
2008-05-16 20:16:57 +03:00
Michel Dänzer
22b1a9dd0f EXA: Skip empty glyphs. (cherry picked from commit ce50bfd336) 2008-05-16 19:52:33 +03:00
Daniel Stone
2989f10716 Prevent the -wm command line option from causing a SEGV
The -wm (when mapped) option for the BackingStore support has been
causing the server to dereference a NULL pointer.

This has probably been the case since backing store has been
implemented on top of Composite.

It looks like (some of?) Composite didn’t expect its WIndowPtr
argument to be the root window.

In Composite’s compCheckRedirect() function we now avoid calling
compAllocPixmap() and compFreePixmap() when the pWin pointer’s
parent member is NULL, as is it the case with a server’s root window.

This addresses:

https://bugs.freedesktop.org/show_bug.cgi?id=15878
(cherry picked from commit 04211c3532)
2008-05-16 19:49:05 +03:00
Adam Jackson
33a9ee9ba0 Bug #13962: Re-arm the DPMS timer when re-enabling DPMS.
(cherry picked from commit 536f2ff538)
2008-05-16 17:26:57 +03:00
Adam Jackson
a08f848d4c Bump DEFAULT_DPI to 96.
75 is just nonsense.
(cherry picked from commit db9ae86353)
2008-05-16 17:26:53 +03:00
Adam Jackson
d5a7badd6a Fix hal shutdown crash.
Removing the device invalidates its ->next pointer.  Copy it aside before
destroying the device.
(cherry picked from commit f52f6c5c7e)
2008-05-16 17:20:08 +03:00
Eric Anholt
458b487723 Fix overly-restrictive integer overflow check in EXA pixmap creation.
The result was that at 32bpp, pixmaps of width 8192 or greater couldn't be
created, due to treating a pitch value as a width.
(cherry picked from commit bc2d516f16)
2008-05-16 17:20:08 +03:00
Michel Dänzer
2621380cf6 Fix RandR 1.2 driver interface conversion of two colour cursors to ARGB
This patch (and not setting HARDWARE_CURSOR_BIT_ORDER_MSBFIRST on big endian
platforms) fixes it for me with the radeon driver and doesn't break intel.

Correct patch this time :)
(cherry picked from commit da973e962d)
2008-05-16 17:20:08 +03:00
Donnie Berkholz
9db5401d69 xprint: fix linking by including XSERVER_LIBS. 2008-05-16 17:20:08 +03:00
Donnie Berkholz
1022c7774b xprint: fix build by adding {New,Delete}InputDeviceRequest. 2008-05-16 17:20:08 +03:00
Donnie Berkholz
9df3886354 xephyr: fix linking by adding pixman and using XSERVER_LIBS. 2008-05-16 17:20:08 +03:00
Donnie Berkholz
6c5c1c5c98 dmx: link in XSERVER_LIBS. 2008-05-16 17:20:08 +03:00