diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-04-17 17:04:33 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-04-17 17:04:33 -0300 |
commit | 418daee6d5c5c907738cef64044ae32f25138981 (patch) | |
tree | b15797eb85d8dbbcae5e9a68cae0b69daf7a201e /extra/xorg-server | |
parent | 6fed2edc6f9533e7894bbbacdbd1dbbb50076b01 (diff) | |
parent | 049af7a95b01eba14d33586ad5852dddaf107e53 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/cdfs/PKGBUILD
community-testing/open-vm-tools-modules/PKGBUILD
community-testing/open-vm-tools/PKGBUILD
community-testing/virtualbox/PKGBUILD
extra/gnome-device-manager/PKGBUILD
extra/iptraf/PKGBUILD
extra/lirc-utils/PKGBUILD
extra/squeeze/PKGBUILD
extra/texi2html/PKGBUILD
extra/thunar-vfs/PKGBUILD
gnome-unstable/accountsservice/PKGBUILD
gnome-unstable/anjuta/PKGBUILD
gnome-unstable/at-spi/PKGBUILD
gnome-unstable/at-spi2-atk/PKGBUILD
gnome-unstable/at-spi2-core/PKGBUILD
gnome-unstable/atk/PKGBUILD
gnome-unstable/atkmm/PKGBUILD
gnome-unstable/avahi/PKGBUILD
gnome-unstable/brasero/PKGBUILD
gnome-unstable/cairomm/PKGBUILD
gnome-unstable/cheese/PKGBUILD
gnome-unstable/clutter-gst/PKGBUILD
gnome-unstable/clutter-gtk/PKGBUILD
gnome-unstable/clutter-gtk2/PKGBUILD
gnome-unstable/clutter/PKGBUILD
gnome-unstable/dconf/PKGBUILD
gnome-unstable/devhelp/PKGBUILD
gnome-unstable/ekiga/PKGBUILD
gnome-unstable/empathy/PKGBUILD
gnome-unstable/eog-plugins/PKGBUILD
gnome-unstable/eog/PKGBUILD
gnome-unstable/epiphany-extensions/PKGBUILD
gnome-unstable/epiphany/PKGBUILD
gnome-unstable/evince/PKGBUILD
gnome-unstable/evolution-data-server/PKGBUILD
gnome-unstable/evolution-exchange/PKGBUILD
gnome-unstable/evolution/PKGBUILD
gnome-unstable/farsight2/PKGBUILD
gnome-unstable/file-roller/PKGBUILD
gnome-unstable/folks/PKGBUILD
gnome-unstable/gcalctool/PKGBUILD
gnome-unstable/gconf-editor/PKGBUILD
gnome-unstable/gconf/PKGBUILD
gnome-unstable/gdk-pixbuf2/PKGBUILD
gnome-unstable/gdl/PKGBUILD
gnome-unstable/gdm/PKGBUILD
gnome-unstable/gedit/PKGBUILD
gnome-unstable/gjs/PKGBUILD
gnome-unstable/glade/PKGBUILD
gnome-unstable/glib-networking/PKGBUILD
gnome-unstable/glib2/PKGBUILD
gnome-unstable/glibmm/PKGBUILD
gnome-unstable/gnome-applets/PKGBUILD
gnome-unstable/gnome-bluetooth/PKGBUILD
gnome-unstable/gnome-color-manager/PKGBUILD
gnome-unstable/gnome-control-center/PKGBUILD
gnome-unstable/gnome-desktop/PKGBUILD
gnome-unstable/gnome-disk-utility/PKGBUILD
gnome-unstable/gnome-games/PKGBUILD
gnome-unstable/gnome-keyring/PKGBUILD
gnome-unstable/gnome-media/PKGBUILD
gnome-unstable/gnome-menus/PKGBUILD
gnome-unstable/gnome-nettool/PKGBUILD
gnome-unstable/gnome-panel/PKGBUILD
gnome-unstable/gnome-pilot/PKGBUILD
gnome-unstable/gnome-power-manager/PKGBUILD
gnome-unstable/gnome-screensaver/PKGBUILD
gnome-unstable/gnome-session/PKGBUILD
gnome-unstable/gnome-settings-daemon/PKGBUILD
gnome-unstable/gnome-shell/PKGBUILD
gnome-unstable/gnome-system-monitor/PKGBUILD
gnome-unstable/gnome-terminal/PKGBUILD
gnome-unstable/gnome-themes-standard/PKGBUILD
gnome-unstable/gnome-user-share/PKGBUILD
gnome-unstable/gnome-utils/PKGBUILD
gnome-unstable/gobject-introspection/PKGBUILD
gnome-unstable/gthumb/PKGBUILD
gnome-unstable/gtk-vnc/PKGBUILD
gnome-unstable/gtk2/PKGBUILD
gnome-unstable/gtk3/PKGBUILD
gnome-unstable/gtkhtml4/PKGBUILD
gnome-unstable/gtkmm/PKGBUILD
gnome-unstable/gtkmm3/PKGBUILD
gnome-unstable/gtksourceview3/PKGBUILD
gnome-unstable/gucharmap/PKGBUILD
gnome-unstable/gvfs/PKGBUILD
gnome-unstable/lcms2/PKGBUILD
gnome-unstable/libcanberra/PKGBUILD
gnome-unstable/libchamplain/PKGBUILD
gnome-unstable/libdmapsharing/PKGBUILD
gnome-unstable/libgda/PKGBUILD
gnome-unstable/libgdata/PKGBUILD
gnome-unstable/libgnome-keyring/PKGBUILD
gnome-unstable/libgnome-media-profiles/PKGBUILD
gnome-unstable/libgnomekbd/PKGBUILD
gnome-unstable/libgpod/PKGBUILD
gnome-unstable/libgweather/PKGBUILD
gnome-unstable/libimobiledevice/PKGBUILD
gnome-unstable/libnice/PKGBUILD
gnome-unstable/libnotify/PKGBUILD
gnome-unstable/libpeas/PKGBUILD
gnome-unstable/librsvg/PKGBUILD
gnome-unstable/libsocialweb/PKGBUILD
gnome-unstable/libsoup/PKGBUILD
gnome-unstable/libunique/PKGBUILD
gnome-unstable/libunique3/PKGBUILD
gnome-unstable/libwebkit/PKGBUILD
gnome-unstable/libwnck/PKGBUILD
gnome-unstable/libwnck3/PKGBUILD
gnome-unstable/libxklavier/PKGBUILD
gnome-unstable/metacity/PKGBUILD
gnome-unstable/mousetweaks/PKGBUILD
gnome-unstable/mutter/PKGBUILD
gnome-unstable/mx/PKGBUILD
gnome-unstable/nautilus-open-terminal/PKGBUILD
gnome-unstable/nautilus-sendto/PKGBUILD
gnome-unstable/nautilus/PKGBUILD
gnome-unstable/network-manager-applet/PKGBUILD
gnome-unstable/networkmanager-openvpn/PKGBUILD
gnome-unstable/networkmanager-pptp/PKGBUILD
gnome-unstable/networkmanager-vpnc/PKGBUILD
gnome-unstable/networkmanager/PKGBUILD
gnome-unstable/notification-daemon/PKGBUILD
gnome-unstable/opal/PKGBUILD
gnome-unstable/pangomm/PKGBUILD
gnome-unstable/pidgin/PKGBUILD
gnome-unstable/polkit-gnome/PKGBUILD
gnome-unstable/polkit/PKGBUILD
gnome-unstable/ptlib/PKGBUILD
gnome-unstable/pygobject/PKGBUILD
gnome-unstable/pygtk/PKGBUILD
gnome-unstable/rest/PKGBUILD
gnome-unstable/rhythmbox/PKGBUILD
gnome-unstable/seahorse/PKGBUILD
gnome-unstable/sound-juicer/PKGBUILD
gnome-unstable/telepathy-gabble/PKGBUILD
gnome-unstable/telepathy-glib/PKGBUILD
gnome-unstable/telepathy-logger/PKGBUILD
gnome-unstable/telepathy-mission-control/PKGBUILD
gnome-unstable/tomboy/PKGBUILD
gnome-unstable/totem-plparser/PKGBUILD
gnome-unstable/totem/PKGBUILD
gnome-unstable/upower/PKGBUILD
gnome-unstable/vinagre/PKGBUILD
gnome-unstable/vino/PKGBUILD
gnome-unstable/vte/PKGBUILD
gnome-unstable/yelp/PKGBUILD
gnome-unstable/zenity/PKGBUILD
libre-testing/kernel26-libre/PKGBUILD
multilib-testing/lib32-libdrm/PKGBUILD
staging/kdeaccessibility/PKGBUILD
staging/kdeadmin/PKGBUILD
staging/kdeartwork/PKGBUILD
staging/kdebase-runtime/PKGBUILD
staging/kdebase-workspace/PKGBUILD
staging/kdebase/PKGBUILD
staging/kdebindings/PKGBUILD
staging/kdeedu/PKGBUILD
staging/kdegames/PKGBUILD
staging/kdegraphics/PKGBUILD
staging/kdelibs/PKGBUILD
staging/kdemultimedia/PKGBUILD
staging/kdenetwork/PKGBUILD
staging/kdepimlibs/PKGBUILD
staging/kdeplasma-addons/PKGBUILD
staging/kdeplasma-applets-networkmanagement/PKGBUILD
staging/kdesdk/PKGBUILD
staging/kdetoys/PKGBUILD
staging/kdeutils/PKGBUILD
staging/kdewebdev/PKGBUILD
staging/strigi/PKGBUILD
testing/aufs2-util/PKGBUILD
testing/crda/PKGBUILD
testing/dhcpcd/PKGBUILD
testing/dmraid/PKGBUILD
testing/eventlog/PKGBUILD
testing/fakeroot/PKGBUILD
testing/gnutls/PKGBUILD
testing/libdrm/PKGBUILD
testing/libgcrypt/PKGBUILD
testing/libgpg-error/PKGBUILD
testing/libpipeline/PKGBUILD
testing/libx11/PKGBUILD
testing/lilo/PKGBUILD
testing/lirc/PKGBUILD
testing/madwifi/PKGBUILD
testing/man-db/PKGBUILD
testing/mlocate/PKGBUILD
testing/ncurses/PKGBUILD
testing/python2/PKGBUILD
testing/rsync/PKGBUILD
testing/sqlite3/PKGBUILD
testing/sudo/PKGBUILD
testing/syslog-ng/PKGBUILD
testing/tzdata/PKGBUILD
testing/xf86-input-acecad/PKGBUILD
testing/xf86-input-aiptek/PKGBUILD
testing/xf86-input-evdev/PKGBUILD
testing/xf86-input-joystick/PKGBUILD
testing/xf86-input-keyboard/PKGBUILD
testing/xf86-input-mouse/PKGBUILD
testing/xf86-input-synaptics/PKGBUILD
testing/xf86-input-void/PKGBUILD
testing/xf86-input-wacom/PKGBUILD
testing/xf86-video-apm/PKGBUILD
testing/xf86-video-ark/PKGBUILD
testing/xf86-video-ast/PKGBUILD
testing/xf86-video-ati/PKGBUILD
testing/xf86-video-chips/PKGBUILD
testing/xf86-video-cirrus/PKGBUILD
testing/xf86-video-dummy/PKGBUILD
testing/xf86-video-fbdev/PKGBUILD
testing/xf86-video-glint/PKGBUILD
testing/xf86-video-i128/PKGBUILD
testing/xf86-video-i740/PKGBUILD
testing/xf86-video-intel/PKGBUILD
testing/xf86-video-mach64/PKGBUILD
testing/xf86-video-mga/PKGBUILD
testing/xf86-video-neomagic/PKGBUILD
testing/xf86-video-nouveau/PKGBUILD
testing/xf86-video-nv/PKGBUILD
testing/xf86-video-openchrome/PKGBUILD
testing/xf86-video-r128/PKGBUILD
testing/xf86-video-rendition/PKGBUILD
testing/xf86-video-s3/PKGBUILD
testing/xf86-video-s3virge/PKGBUILD
testing/xf86-video-savage/PKGBUILD
testing/xf86-video-siliconmotion/PKGBUILD
testing/xf86-video-sis/PKGBUILD
testing/xf86-video-sisusb/PKGBUILD
testing/xf86-video-tdfx/PKGBUILD
testing/xf86-video-trident/PKGBUILD
testing/xf86-video-tseng/PKGBUILD
testing/xf86-video-unichrome/PKGBUILD
testing/xf86-video-v4l/PKGBUILD
testing/xf86-video-vesa/PKGBUILD
testing/xf86-video-voodoo/PKGBUILD
testing/xf86-video-xgi/PKGBUILD
testing/xf86-video-xgixp/PKGBUILD
testing/xorg-server/PKGBUILD
testing/xz/PKGBUILD
Diffstat (limited to 'extra/xorg-server')
-rw-r--r-- | extra/xorg-server/vbe-fix-malloc-size-bug.patch | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/extra/xorg-server/vbe-fix-malloc-size-bug.patch b/extra/xorg-server/vbe-fix-malloc-size-bug.patch deleted file mode 100644 index 01ed040d4..000000000 --- a/extra/xorg-server/vbe-fix-malloc-size-bug.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 8ffaef2ebd2611e2eed4ef97350c3a34508f5252 Mon Sep 17 00:00:00 2001 -From: Adam Jackson <ajax@redhat.com> -Date: Thu, 24 Feb 2011 21:06:34 +0000 -Subject: vbe: Fix malloc size bug - -v2: Slightly more obvious sizing math. - -==14882== Invalid write of size 2 -==14882== at 0x6750267: VBEGetVBEInfo (vbe.c:400) -==14882== by 0x6142064: ??? (in /usr/lib64/xorg/modules/drivers/vesa_drv.so) -==14882== by 0x471895: InitOutput (xf86Init.c:519) -==14882== by 0x422778: main (main.c:205) -==14882== Address 0x4f32fa8 is 72 bytes inside a block of size 73 alloc'd -==14882== at 0x4A0640D: malloc (vg_replace_malloc.c:236) -==14882== by 0x675024B: VBEGetVBEInfo (vbe.c:398) -==14882== by 0x6142064: ??? (in /usr/lib64/xorg/modules/drivers/vesa_drv.so) -==14882== by 0x471895: InitOutput (xf86Init.c:519) -==14882== by 0x422778: main (main.c:205) - -Reviewed-by: Mark Kettenis <kettenis@openbsd.org> -Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> -Signed-off-by: Adam Jackson <ajax@redhat.com> -(cherry picked from commit d8caa782009abf4dc17b945e325e83fda299a534) ---- -diff --git a/hw/xfree86/vbe/vbe.c b/hw/xfree86/vbe/vbe.c -index 7a64a4a..1d3775b 100644 ---- a/hw/xfree86/vbe/vbe.c -+++ b/hw/xfree86/vbe/vbe.c -@@ -395,7 +395,7 @@ VBEGetVBEInfo(vbeInfoPtr pVbe) - i = 0; - while (modes[i] != 0xffff) - i++; -- block->VideoModePtr = malloc(sizeof(CARD16) * i + 1); -+ block->VideoModePtr = malloc(sizeof(CARD16) * (i + 1)); - memcpy(block->VideoModePtr, modes, sizeof(CARD16) * i); - block->VideoModePtr[i] = 0xffff; - --- -cgit v0.8.3-6-g21f6 |