diff options
| author | tsi <tsi> | 2008-07-16 17:01:41 +0000 |
|---|---|---|
| committer | tsi <tsi> | 2008-07-16 17:01:41 +0000 |
| commit | 7b1ac8144713f440128385fb7ce86820e80d6e93 (patch) | |
| tree | 69e25cc1c78580b8cc53c45904847bbc626e5a35 | |
| parent | 50316a2ed64a2467de7f9c81720c6d5ac6a69a38 (diff) | |
57. Immunise VBESetGetPalletteData() against attempts to set null pallette
data. (Dick Wesseling, Bugzilla #1691).
| -rw-r--r-- | programs/Xserver/hw/xfree86/CHANGELOG | 4 | ||||
| -rw-r--r-- | programs/Xserver/hw/xfree86/vbe/vbe.c | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/programs/Xserver/hw/xfree86/CHANGELOG b/programs/Xserver/hw/xfree86/CHANGELOG index 8a1588ace..30ac19be3 100644 --- a/programs/Xserver/hw/xfree86/CHANGELOG +++ b/programs/Xserver/hw/xfree86/CHANGELOG @@ -1,4 +1,6 @@ XFree86 4.7.99.22 (xx July 2008) + 57. Immunise VBESetGetPalletteData() against attempts to set null pallette + data. (Dick Wesseling, Bugzilla #1691). XFree86 4.7.99.21 (9 July 2008) 56. Allow 32-bit PCI I/O addresses on Linux/PowerPC (Marc La France). @@ -20773,4 +20775,4 @@ XFree86 3.0a (28 April 1994) XFree86 3.0 (26 April 1994) -$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.3971 2008/07/01 18:16:41 tsi Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.3972 2008/07/09 11:03:39 dawes Exp $ diff --git a/programs/Xserver/hw/xfree86/vbe/vbe.c b/programs/Xserver/hw/xfree86/vbe/vbe.c index 0e250b792..41ad26e91 100644 --- a/programs/Xserver/hw/xfree86/vbe/vbe.c +++ b/programs/Xserver/hw/xfree86/vbe/vbe.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbe.c,v 1.18 2005/10/14 15:17:10 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbe.c,v 1.19tsi Exp $ */ /* * XFree86 vbe module @@ -989,6 +989,9 @@ VBESetGetPaletteData(vbeInfoPtr pVbe, Bool set, int first, int num, AX := VBE Return Status */ + if (set && !data) + return NULL; + pVbe->pInt10->num = 0x10; pVbe->pInt10->ax = 0x4f09; if (!secondary) |