Hello community,
here is the log from the commit of package xorg-x11-server for openSUSE:Factory
checked in at Sat Oct 16 12:25:20 CEST 2010.
--------
--- xorg-x11-server/xorg-x11-server.changes 2010-10-15 14:16:21.000000000 +0200
+++ /mounts/work_src_done/STABLE/xorg-x11-server/xorg-x11-server.changes 2010-10-15 21:15:51.000000000 +0200
@@ -1,0 +2,8 @@
+Fri Oct 15 18:59:14 UTC 2010 - sndirsch@novell.com
+
+- xorg-server 1.9.0.902
+ * This release fixes an input regression introduced in 1.9.1 as
+ well as some additional memory management issues.
+- obsoletes vbe-bufferoverflow.diff
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
vbe-bufferoverflow.diff
xorg-server-1.9.0.901.tar.bz2
New:
----
xorg-server-1.9.0.902.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-server.spec ++++++
--- /var/tmp/diff_new_pack.tplpEu/_old 2010-10-16 12:24:37.000000000 +0200
+++ /var/tmp/diff_new_pack.tplpEu/_new 2010-10-16 12:24:37.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package xorg-x11-server (Version 7.5_1.9.0.901)
+# spec file for package xorg-x11-server (Version 7.5_1.9.0.902)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -20,7 +20,7 @@
%define moblin 0
Name: xorg-x11-server
-%define dirsuffix 1.9.0.901
+%define dirsuffix 1.9.0.902
%define vnc 0
BuildRequires: Mesa-devel bison flex fontconfig-devel freetype2-devel ghostscript-library libdrm-devel libopenssl-devel pkgconfig xorg-x11 xorg-x11-devel xorg-x11-fonts-devel xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libXext-devel xorg-x11-libXfixes-devel xorg-x11-libXmu-devel xorg-x11-libXp-devel xorg-x11-libXpm-devel xorg-x11-libXprintUtil-devel xorg-x11-libXrender-devel xorg-x11-libXt-devel xorg-x11-libXv-devel xorg-x11-libfontenc-devel xorg-x11-libxkbfile-devel xorg-x11-proto-devel xorg-x11-xtrans-devel
### udev support (broken on openSUSE 11.2, see also bnc #589997)
@@ -32,7 +32,7 @@
%endif
Url: http://xorg.freedesktop.org/
Version: 7.5_%{dirsuffix}
-Release: 2
+Release: 1
License: GPLv2+ ; MIT License (or similar)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4
@@ -114,7 +114,6 @@
Patch213: xorg-server-xdmcp.patch
Patch217: CVE-2010-2240-address_space_limit.patch
Patch218: CVE-2010-2240-tree_depth_limit.patch
-Patch219: vbe-bufferoverflow.diff
Patch220: Use-external-tool-for-creating-backtraces-on-crashes.patch
%if %moblin
Patch300: moblin-use_preferred_mode_for_all_outputs.diff
@@ -240,7 +239,6 @@
%patch213 -p1
%patch217 -p1
%patch218 -p1
-%patch219 -p1
%patch220 -p1
%if %moblin
%patch300 -p1
++++++ xorg-server-1.9.0.901.tar.bz2 -> xorg-server-1.9.0.902.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.9.0.901/ChangeLog new/xorg-server-1.9.0.902/ChangeLog
--- old/xorg-server-1.9.0.901/ChangeLog 2010-10-01 23:17:44.000000000 +0200
+++ new/xorg-server-1.9.0.902/ChangeLog 2010-10-15 20:25:30.000000000 +0200
@@ -1,3 +1,51 @@
+commit 4dd316f25261707620cd4c52e2987b93627ff260
+Author: Jeremy Huddleston
+Date: Fri Oct 15 11:08:42 2010 -0700
+
+ Bump version to 1.9.0.902 (1.9.1 rc2)
+
+ Signed-off-by: Jeremy Huddleston
+
+commit 712853fbcbc644575d791fa48fbd5757cd850f1d
+Author: Jon TURNEY
+Date: Wed Oct 13 17:34:31 2010 +0100
+
+ event_size is currently never assigned to in mieqProcessInputEvents().
+
+ event_size is never assigned to in mieqProcessInputEvents(), so realloc()
+ is always called. This is benign, but I'm guessing not intended.
+
+ Signed-off-by: Jon TURNEY
+ Reviewed-by: Keith Packard
+ Signed-off-by: Keith Packard
+ (cherry picked from commit da4eebe58ec81e2297cc1773af1fb622fb392bbd)
+
+commit efeb2ebd7e307224a735469ff89a3a6af4cf143b
+Author: Adam Jackson
+Date: Tue Oct 5 11:24:28 2010 -0400
+
+ vbe: Fix copying the mode info block
+
+ Just use memcpy, seriously.
+
+ Reviewed-by: Rémi Cardona
+ Signed-off-by: Adam Jackson
+ Signed-off-by: Keith Packard
+ (cherry picked from commit 853d7ebfa3e2d281d92890a39010ff5787a00ffd)
+
+commit e5b19f14eac609e3c315e14e20ca1935de8de0e3
+Author: Jeremy Huddleston
+Date: Tue Oct 12 17:42:55 2010 -0700
+
+ Revert "dix: don't create core motion events for non-x/y valuators."
+
+ Reverting due to fallout discussed in bug #30267. See:
+ https://bugs.freedesktop.org/show_bug.cgi?id=30267
+
+ This reverts commit d4ef63f602325a9920dc1cbf64e3969dfa394d5f.
+
+ Signed-off-by: Jeremy Huddleston
+
commit 8ab87dc7ff48d4db8e5f95a74df627dac9c53c0a
Author: Jeremy Huddleston
Date: Fri Oct 1 13:37:49 2010 -0700
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.9.0.901/aclocal.m4 new/xorg-server-1.9.0.902/aclocal.m4
--- old/xorg-server-1.9.0.901/aclocal.m4 2010-10-01 23:16:53.000000000 +0200
+++ new/xorg-server-1.9.0.902/aclocal.m4 2010-10-15 20:24:16.000000000 +0200
@@ -1403,7 +1403,7 @@
dnl xorg-macros.m4. Generated from xorg-macros.m4.in xorgversion.m4 by configure.
dnl
-dnl Copyright 2005-2006 Sun Microsystems, Inc. All rights reserved.
+dnl Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
dnl
dnl Permission is hereby granted, free of charge, to any person obtaining a
dnl copy of this software and associated documentation files (the "Software"),
@@ -1440,7 +1440,7 @@
# See the "minimum version" comment for each macro you use to see what
# version you require.
m4_defun([XORG_MACROS_VERSION],[
-m4_define([vers_have], [1.10.0])
+m4_define([vers_have], [1.10.1])
m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.])))
m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.])))
m4_if(m4_cmp(maj_have, maj_needed), 0,,
@@ -1591,6 +1591,7 @@
-e 's|__xservername__|Xorg|g' \
-e 's|__xconfigfile__|xorg.conf|g' \
-e 's|__projectroot__|\$(prefix)|g' \
+ -e 's|__apploaddir__|\$(appdefaultdir)|g' \
-e 's|__appmansuffix__|\$(APP_MAN_SUFFIX)|g' \
-e 's|__drivermansuffix__|\$(DRIVER_MAN_SUFFIX)|g' \
-e 's|__adminmansuffix__|\$(ADMIN_MAN_SUFFIX)|g' \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.9.0.901/compile new/xorg-server-1.9.0.902/compile
--- old/xorg-server-1.9.0.901/compile 2010-10-01 23:16:32.000000000 +0200
+++ new/xorg-server-1.9.0.902/compile 2010-10-15 20:23:58.000000000 +0200
@@ -1,13 +1,20 @@
#!/bin/bash
#CONFOPT="--disable-xquartz --disable-glx --disable-dri --disable-launchd --enable-kdrive --disable-xsdl --enable-xnest --enable-xvfb"
-
CONFOPT="--enable-standalone-xpbproxy"
#CONFOPT="--disable-shave --without-dtrace"
+CONFOPT="${CONFOPT} --with-dtrace"
+
+# This section is for building release tarballs
+CONFOPT="${CONFOPT} --enable-docs --enable-devel-docs --enable-builddocs --with-doxygen --with-xmlto --with-fop"
+export DOXYGEN=/opt/local/bin/doxygen
+export FOP=/opt/local/bin/fop
+export XMLTO=/opt/local/bin/xmlto
+
# Parallel Make. Change $MAKE if you don't have gmake installed
MAKE="gnumake"
-MAKE_OPTS="-j10"
+MAKE_OPTS="-j3"
#SCAN_BUILD="scan-build -v -V -o clang.d"
@@ -30,16 +37,6 @@
#CPPFLAGS="$CPPFLAGS -F/Applications/Utilities/XQuartz.app/Contents/Frameworks"
#LDFLAGS="$LDFLAGS -F/Applications/Utilities/XQuartz.app/Contents/Frameworks"
-#CPPFLAGS="$CPPFLAGS -F/Applications/Utilities/X11.app/Contents/Frameworks"
-#LDFLAGS="$LDFLAGS -F/Applications/Utilities/X11.app/Contents/Frameworks"
-#CONFOPT="${CONFOPT} --enable-sparkle"
-
-export XMLTO=/opt/local/bin/xmlto
-export ASCIIDOC=/opt/local/bin/asciidoc
-export DOXYGEN=/opt/local/bin/doxygen
-export FOP=/opt/local/bin/fop
-export GROFF=/opt/local/bin/groff
-export PS2PDF=/opt/local/bin/ps2pdf
export ACLOCAL CPPFLAGS CFLAGS LDFLAGS
@@ -54,9 +51,8 @@
docomp() {
autoreconf -fvi || die
${SCAN_BUILD} ./configure --prefix=${PREFIX} ${CONFOPT} --disable-dependency-tracking --enable-maintainer-mode --enable-xcsecurity --enable-record --disable-xevie "${@}" || die "Could not configure xserver"
- ${MAKE} dist
-# ${MAKE} clean || die "Unable to make clean"
-# ${SCAN_BUILD} ${MAKE} ${MAKE_OPTS} || die "Could not make xserver"
+ #${MAKE} clean || die "Unable to make clean"
+ ${SCAN_BUILD} ${MAKE} ${MAKE_OPTS} || die "Could not make xserver"
}
doinst() {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.9.0.901/configure new/xorg-server-1.9.0.902/configure
--- old/xorg-server-1.9.0.901/configure 2010-10-01 23:16:58.000000000 +0200
+++ new/xorg-server-1.9.0.902/configure 2010-10-15 20:24:21.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for xorg-server 1.9.0.901.
+# Generated by GNU Autoconf 2.61 for xorg-server 1.9.0.902.
#
# Report bugs to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg.
#
@@ -783,8 +783,8 @@
# Identity of this package.
PACKAGE_NAME='xorg-server'
PACKAGE_TARNAME='xorg-server'
-PACKAGE_VERSION='1.9.0.901'
-PACKAGE_STRING='xorg-server 1.9.0.901'
+PACKAGE_VERSION='1.9.0.902'
+PACKAGE_STRING='xorg-server 1.9.0.902'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
ac_unique_file="Makefile.am"
@@ -1937,7 +1937,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures xorg-server 1.9.0.901 to adapt to many kinds of systems.
+\`configure' configures xorg-server 1.9.0.902 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -2007,7 +2007,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xorg-server 1.9.0.901:";;
+ short | recursive ) echo "Configuration of xorg-server 1.9.0.902:";;
esac
cat <<\_ACEOF
@@ -2388,7 +2388,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xorg-server configure 1.9.0.901
+xorg-server configure 1.9.0.902
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -2402,7 +2402,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xorg-server $as_me 1.9.0.901, which was
+It was created by xorg-server $as_me 1.9.0.902, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2755,7 +2755,7 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-RELEASE_DATE="2010-10-01"
+RELEASE_DATE="2010-10-15"
am__api_version='1.10'
@@ -3094,7 +3094,7 @@
# Define the identity of the package.
PACKAGE='xorg-server'
- VERSION='1.9.0.901'
+ VERSION='1.9.0.902'
cat >>confdefs.h <<_ACEOF
@@ -5831,6 +5831,7 @@
-e 's|__xservername__|Xorg|g' \
-e 's|__xconfigfile__|xorg.conf|g' \
-e 's|__projectroot__|\$(prefix)|g' \
+ -e 's|__apploaddir__|\$(appdefaultdir)|g' \
-e 's|__appmansuffix__|\$(APP_MAN_SUFFIX)|g' \
-e 's|__drivermansuffix__|\$(DRIVER_MAN_SUFFIX)|g' \
-e 's|__adminmansuffix__|\$(ADMIN_MAN_SUFFIX)|g' \
@@ -7915,13 +7916,13 @@
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:7918: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:7919: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:7921: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:7922: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:7924: output\"" >&5)
+ (eval echo "\"\$as_me:7925: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -9020,7 +9021,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 9023 "configure"' > conftest.$ac_ext
+ echo '#line 9024 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -10365,11 +10366,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:10368: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10369: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:10372: \$? = $ac_status" >&5
+ echo "$as_me:10373: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -10689,11 +10690,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:10692: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10693: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:10696: \$? = $ac_status" >&5
+ echo "$as_me:10697: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -10794,11 +10795,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:10797: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10798: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:10801: \$? = $ac_status" >&5
+ echo "$as_me:10802: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -10849,11 +10850,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:10852: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10853: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:10856: \$? = $ac_status" >&5
+ echo "$as_me:10857: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -13597,7 +13598,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 13600 "configure"
+#line 13601 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13697,7 +13698,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 13700 "configure"
+#line 13701 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -33282,7 +33283,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xorg-server $as_me 1.9.0.901, which was
+This file was extended by xorg-server $as_me 1.9.0.902, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -33335,7 +33336,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-xorg-server config.status 1.9.0.901
+xorg-server config.status 1.9.0.902
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.9.0.901/configure.ac new/xorg-server-1.9.0.902/configure.ac
--- old/xorg-server-1.9.0.901/configure.ac 2010-10-01 23:14:46.000000000 +0200
+++ new/xorg-server-1.9.0.902/configure.ac 2010-10-15 20:08:17.000000000 +0200
@@ -26,8 +26,8 @@
dnl Process this file with autoconf to create configure.
AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.9.0.901, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2010-10-01"
+AC_INIT([xorg-server], 1.9.0.902, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2010-10-15"
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.9.0.901/dix/eventconvert.c new/xorg-server-1.9.0.902/dix/eventconvert.c
--- old/xorg-server-1.9.0.901/dix/eventconvert.c 2010-09-28 19:17:31.000000000 +0200
+++ new/xorg-server-1.9.0.902/dix/eventconvert.c 2010-10-14 01:26:50.000000000 +0200
@@ -102,15 +102,6 @@
switch(event->any.type)
{
case ET_Motion:
- {
- DeviceEvent *e = &event->device_event;
- /* Don't create core motion event if neither x nor y are
- * present */
- if (!BitIsOn(e->valuators.mask, 0) &&
- !BitIsOn(e->valuators.mask, 1))
- return BadMatch;
- }
- /* fallthrough */
case ET_ButtonPress:
case ET_ButtonRelease:
case ET_KeyPress:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.9.0.901/hw/xfree86/vbe/vbe.c new/xorg-server-1.9.0.902/hw/xfree86/vbe/vbe.c
--- old/xorg-server-1.9.0.901/hw/xfree86/vbe/vbe.c 2010-06-11 08:10:22.000000000 +0200
+++ new/xorg-server-1.9.0.902/hw/xfree86/vbe/vbe.c 2010-10-15 20:07:52.000000000 +0200
@@ -527,69 +527,9 @@
if (R16(pVbe->pInt10->ax) != 0x4f)
return NULL;
- block = calloc(sizeof(VbeModeInfoBlock), 1);
-
- block->ModeAttributes = *(CARD16*)pVbe->memory;
- block->WinAAttributes = ((char*)pVbe->memory)[2];
- block->WinBAttributes = ((char*)pVbe->memory)[3];
- block->WinGranularity = *(CARD16*)(((char*)pVbe->memory) + 4);
- block->WinSize = *(CARD16*)(((char*)pVbe->memory) + 6);
- block->WinASegment = *(CARD16*)(((char*)pVbe->memory) + 8);
- block->WinBSegment = *(CARD16*)(((char*)pVbe->memory) + 10);
- block->WinFuncPtr = *(CARD32*)(((char*)pVbe->memory) + 12);
- block->BytesPerScanline = *(CARD16*)(((char*)pVbe->memory) + 16);
-
- /* mandatory information for VBE 1.2 and above */
- block->XResolution = *(CARD16*)(((char*)pVbe->memory) + 18);
- block->YResolution = *(CARD16*)(((char*)pVbe->memory) + 20);
- block->XCharSize = ((char*)pVbe->memory)[22];
- block->YCharSize = ((char*)pVbe->memory)[23];
- block->NumberOfPlanes = ((char*)pVbe->memory)[24];
- block->BitsPerPixel = ((char*)pVbe->memory)[25];
- block->NumberOfBanks = ((char*)pVbe->memory)[26];
- block->MemoryModel = ((char*)pVbe->memory)[27];
- block->BankSize = ((char*)pVbe->memory)[28];
- block->NumberOfImages = ((char*)pVbe->memory)[29];
- block->Reserved = ((char*)pVbe->memory)[30];
-
- /* Direct color fields (required for direct/6 and YUV/7 memory models) */
- block->RedMaskSize = ((char*)pVbe->memory)[31];
- block->RedFieldPosition = ((char*)pVbe->memory)[32];
- block->GreenMaskSize = ((char*)pVbe->memory)[33];
- block->GreenFieldPosition = ((char*)pVbe->memory)[34];
- block->BlueMaskSize = ((char*)pVbe->memory)[35];
- block->BlueFieldPosition = ((char*)pVbe->memory)[36];
- block->RsvdMaskSize = ((char*)pVbe->memory)[37];
- block->RsvdFieldPosition = ((char*)pVbe->memory)[38];
- block->DirectColorModeInfo = ((char*)pVbe->memory)[39];
-
- /* Mandatory information for VBE 2.0 and above */
- if (pVbe->version >= 0x200) {
- block->PhysBasePtr = *(CARD32*)(((char*)pVbe->memory) + 40);
- block->Reserved32 = *(CARD32*)(((char*)pVbe->memory) + 44);
- block->Reserved16 = *(CARD16*)(((char*)pVbe->memory) + 48);
-
- /* Mandatory information for VBE 3.0 and above */
- if (pVbe->version >= 0x300) {
- block->LinBytesPerScanLine = *(CARD16*)(((char*)pVbe->memory) + 50);
- block->BnkNumberOfImagePages = ((char*)pVbe->memory)[52];
- block->LinNumberOfImagePages = ((char*)pVbe->memory)[53];
- block->LinRedMaskSize = ((char*)pVbe->memory)[54];
- block->LinRedFieldPosition = ((char*)pVbe->memory)[55];
- block->LinGreenMaskSize = ((char*)pVbe->memory)[56];
- block->LinGreenFieldPosition = ((char*)pVbe->memory)[57];
- block->LinBlueMaskSize = ((char*)pVbe->memory)[58];
- block->LinBlueFieldPosition = ((char*)pVbe->memory)[59];
- block->LinRsvdMaskSize = ((char*)pVbe->memory)[60];
- block->LinRsvdFieldPosition = ((char*)pVbe->memory)[61];
- block->MaxPixelClock = *(CARD32*)(((char*)pVbe->memory) + 62);
- memcpy(&block->Reserved2, ((char*)pVbe->memory) + 66, 188);
- }
- else
- memcpy(&block->LinBytesPerScanLine, ((char*)pVbe->memory) + 50, 206);
- }
- else
- memcpy(&block->PhysBasePtr, ((char*)pVbe->memory) + 40, 216);
+ block = malloc(sizeof(VbeModeInfoBlock));
+ if (block)
+ memcpy(block, pVbe->memory, sizeof(*block));
return block;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.9.0.901/mi/mieq.c new/xorg-server-1.9.0.902/mi/mieq.c
--- old/xorg-server-1.9.0.901/mi/mieq.c 2010-05-13 05:16:31.000000000 +0200
+++ new/xorg-server-1.9.0.902/mi/mieq.c 2010-10-15 20:07:52.000000000 +0200
@@ -439,7 +439,11 @@
evlen = e->events->evlen;
if(evlen > event_size)
+ {
event = realloc(event, evlen);
+ event_size = evlen;
+ }
+
if (!event)
FatalError("[mi] No memory left for event processing.\n");
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org