summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
2013-11-22Remove fallback for _XEatDataWords, require libX11 1.6 for itMichael Joost
_XEatDataWords was orignally introduced with the May 2013 security patches, and in order to ease the process of delivering those, fallback versions of _XEatDataWords were included in the X extension library patches so they could be applied to older versions that didn't have libX11 1.6 yet. Now that we're past that hurdle, we can drop the fallbacks and just require libX11 1.6 for building new versions of the extension libraries. Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2013-06-24Fix a couple sign comparison warningsAlan Coopersmith
XF86VMode.c:352:19: warning: comparison of integers of different signs: 'int' and 'CARD32' (aka 'unsigned int') [-Wsign-compare] for (i = 0; i < rep.modecount; i++) { ~ ^ ~~~~~~~~~~~~~ XF86VMode.c:1048:16: warning: comparison of integers of different signs: 'int' and 'CARD32' (aka 'unsigned int') [-Wsign-compare] for (i = 0; i < rep.clocks; i++) { ~ ^ ~~~~~~~~~~ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2013-06-24Require ANSI C89 pre-processor, drop pre-C89 token pasting supportAlan Coopersmith
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2013-04-26avoid integer overflow in XF86VidModeGetModeLine()Alan Coopersmith
rep.privsize is a CARD32 and needs to be bounds checked before multiplying by sizeof(INT32) to come up with the total size to allocate & read to avoid integer overflow, though it would not result in buffer overflow as the same calculation was used for both allocation & reading from the network. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2013-04-26memory corruption in XF86VidModeGetGammaRamp() [CVE-2013-2001]Alan Coopersmith
We trusted the server not to return more data than the client said it had allocated room for, and would overflow the provided buffers if it did. Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com> Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2013-04-15Use _XEatDataWords to avoid overflow of length calculationsAlan Coopersmith
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2013-04-15Unlock display before returning alloc error in XF86VidModeGetDotClocks()Alan Coopersmith
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2013-04-15Unlock display before returning alloc error in XF86VidModeGetAllModeLines()Alan Coopersmith
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2013-04-15Unlock display before returning alloc error in XF86VidModeGetModeLine()Alan Coopersmith
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2013-04-15Improve error handling in XF86VidModeGetMonitor()Alan Coopersmith
Ensure that when we return an error we unlock the display first, and NULL out any pointers we freed in error cleanup. Instead of adding these fixes to every error check, instead combine the error handling cleanup into a single copy. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2013-04-15When Xcalloc() returns NULL, you don't need to Xfree() itAlan Coopersmith
I have no words to explain how this ever happened. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2013-01-18Replace deprecated Automake INCLUDES variable with AM_CPPFLAGSAlan Coopersmith
Excerpt https://lists.gnu.org/archive/html/automake/2012-12/msg00038.html - Support for the long-deprecated INCLUDES variable will be removed altogether in Automake 1.14. The AM_CPPFLAGS variable should be used instead. This variable was deprecated in Automake releases prior to 1.10, which is the current minimum level required to build X. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2011-11-10Fix gcc -Wwrite-strings warningAlan Coopersmith
2011-09-16Strip trailing whitespaceAlan Coopersmith
Performed with: find * -type f | xargs perl -i -p -e 's{[ \t]+$}{}' git diff -w & git diff -b show no diffs from this change Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2010-07-08Purge macros NEED_EVENTS and NEED_REPLIESFernando Carrijo
Signed-off-by: Fernando Carrijo <fcarrijo@yahoo.com.br> Acked-by: Tiago Vignatti <tiago.vignatti@nokia.com> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2009-08-28Include xf86vmproto instead of xf86vmstr.hPeter Hutterer
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-08-27Move the xf86vmode.h header from the proto package to here.Peter Hutterer
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-02-02Janitor: ansification, make distcheck, compiler warnings, .gitignore.Paulo Cesar Pereira de Andrade
2008-06-13Don't terminate zero-length strings.Adam Jackson
Just leave vendor and model NULL if the response didn't include them.
2008-03-24Bug #10846: Fix XF86VidModeGetMonitor when vendor or model are null.Adam Jackson
2006-07-13renamed: .cvsignore -> .gitignoreAlan Coopersmith
2005-12-03Add check and cflags for malloc(0) returning NULL.Kevin E Martin
2005-07-09Add .cvsignore files Switch _la_CFLAGS for AM_CFLAGS to clean up directoryKeith Packard
2005-06-10Apply patch from Jeff Smith (whydoubt@yahoo.com):Søren Sandmann Pedersen
- Add file linking for Xxf86misc, Xxf86dga, and Xxf86vm. - Check in build system for Xxf86misc, Xxf86dga, and Xxf86vm.
2004-04-23Merging XORG-CURRENT into trunksco_port_update-baserel-0-6-1lg3d-rel-0-7-0lg3d-rel-0-6-2lg3d-baseXORG-6_8_99_903XORG-6_8_99_902XORG-6_8_99_901XORG-6_8_99_900XORG-6_8_99_9XORG-6_8_99_8XORG-6_8_99_7XORG-6_8_99_6XORG-6_8_99_5XORG-6_8_99_4XORG-6_8_99_3XORG-6_8_99_2XORG-6_8_99_16XORG-6_8_99_15XORG-6_8_99_14XORG-6_8_99_13XORG-6_8_99_12XORG-6_8_99_11XORG-6_8_99_10XORG-6_8_99_1XORG-6_8_2XORG-6_8_1_904XORG-6_8_1_903XORG-6_8_1_902XORG-6_8_1_901XORG-6_8_1XORG-6_8_0XORG-6_7_99_904XORG-6_7_99_903XORG-6_7_99_902XORG-6_7_99_901XORG-6_7_99_2XORG-6_7_99_1XACE-SELINUX-MERGEEgbert Eich
2004-03-14Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004xf86-4_4_99_1Egbert Eich
2004-03-03Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004xf86-4_4_0Egbert Eich
2004-02-26readding XFree86's cvs IDsxf86-4_3_99_903Egbert Eich
2004-02-26Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004Egbert Eich
2003-11-14Initial revisionKaleb Keithley