summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDexuan Cui <dexuan.cui@intel.com>2011-12-30 15:34:35 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-03 12:10:50 +0000
commit72c6f939c9130328045bda1c8896e078b75f07f0 (patch)
tree975bd6556659b82ad75cce4848e34a68f01ca3a7
parent7823f5b15797faadd9b1527a08ebbd29d11f5a41 (diff)
downloadopenembedded-core-72c6f939c9130328045bda1c8896e078b75f07f0.tar.gz
openembedded-core-72c6f939c9130328045bda1c8896e078b75f07f0.tar.bz2
openembedded-core-72c6f939c9130328045bda1c8896e078b75f07f0.tar.xz
openembedded-core-72c6f939c9130328045bda1c8896e078b75f07f0.zip
libpciaccess: upgrade from 0.12.1 to 0.12.902
According to http://cgit.freedesktop.org/xorg/lib/libpciaccess/log/, 0.12.902 does fix some bugs, so let's upgrade to it. Moreover, I pulled a patch from upstream git repo. I also updated the COPYING's chksum since there is a minor change to the Copyright header. Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
-rw-r--r--meta/recipes-graphics/xorg-lib/libpciaccess-0.12.902/fix_deletion_of_last_handle.patch51
-rw-r--r--meta/recipes-graphics/xorg-lib/libpciaccess_0.12.902.bb (renamed from meta/recipes-graphics/xorg-lib/libpciaccess_0.12.1.bb)8
2 files changed, 56 insertions, 3 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libpciaccess-0.12.902/fix_deletion_of_last_handle.patch b/meta/recipes-graphics/xorg-lib/libpciaccess-0.12.902/fix_deletion_of_last_handle.patch
new file mode 100644
index 000000000..1933f4549
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libpciaccess-0.12.902/fix_deletion_of_last_handle.patch
@@ -0,0 +1,51 @@
+Upstream-Status: Backport
+
+The below patch is from
+http://cgit.freedesktop.org/xorg/lib/libpciaccess/commit/?id=a798395a1bfd9d06d40e2d8d14377a156c94429a
+It would appear in the next .tar.bz2 release.
+
+------------------------------
+
+commit a798395a1bfd9d06d40e2d8d14377a156c94429a
+Author: Daniel Drake <dsd@laptop.org>
+Date: Fri Nov 25 12:28:48 2011 -0600
+
+ delete_io_handle: fix deletion of last handle
+
+ When num_ios goes from 1 to 0, a realloc(ios, 0); call is made.
+ This is equivalent to free(ios) and NULL is returned.
+
+ However, the previous logic in the code incorrectly discards this NULL
+ return value. When we next call new_io_handle(), realloc(ios, X) is
+ called with "ios" pointing to freed memory. This causes glibc to abort.
+
+ Correct this logic to detect the 1-to-0 case and handle it correctly.
+ Other cases are unchanged; there is still value in checking the
+ return value from realloc() as it also returns NULL on error.
+
+ Signed-off-by: Daniel Drake <dsd@laptop.org>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+diff --git a/src/common_io.c b/src/common_io.c
+index f1319f8..5b35e07 100644
+--- a/src/common_io.c
++++ b/src/common_io.c
+@@ -64,10 +64,15 @@ delete_io_handle(struct pci_io_handle *handle)
+ }
+ }
+
+- new = realloc(ios, sizeof(struct pci_io_handle) * (num_ios - 1));
+- if (new)
+- ios = new;
+ num_ios--;
++ if (num_ios) {
++ new = realloc(ios, sizeof(struct pci_io_handle) * num_ios);
++ if (new)
++ ios = new;
++ } else {
++ free(ios);
++ ios = NULL;
++ }
+ }
+
+ _pci_hidden void
diff --git a/meta/recipes-graphics/xorg-lib/libpciaccess_0.12.1.bb b/meta/recipes-graphics/xorg-lib/libpciaccess_0.12.902.bb
index b3091fd7c..5043634fd 100644
--- a/meta/recipes-graphics/xorg-lib/libpciaccess_0.12.1.bb
+++ b/meta/recipes-graphics/xorg-lib/libpciaccess_0.12.902.bb
@@ -5,12 +5,14 @@ PCI bus and devices in a platform-independant way."
require xorg-lib-common.inc
+SRC_URI += "file://fix_deletion_of_last_handle.patch"
+
LICENSE = "MIT & MIT-style"
-LIC_FILES_CHKSUM = "file://COPYING;md5=2c765efe1e0722c1badff5e54429b102"
+LIC_FILES_CHKSUM = "file://COPYING;md5=de01cb89a769dc657d4c321c209ce4fc"
PR = "r0"
DEPENDS += "xproto virtual/libx11"
-SRC_URI[md5sum] = "d6363ee9f4df79f6fc47cba7c67b0d35"
-SRC_URI[sha256sum] = "cc47d7f0e48cf4eed972916b536fdc97788d7521915e3ae1cc92d540776d7344"
+SRC_URI[md5sum] = "f1db198398a8a1143822acc230843e8c"
+SRC_URI[sha256sum] = "0861d5bf68b598baa307e5c9b06dfd38ae03096b46e36b236106517bcd14b63a"