summaryrefslogtreecommitdiff
path: root/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
diff options
context:
space:
mode:
authorLi Wang <li.wang@windriver.com>2012-12-13 14:51:22 +0800
committerScott Garman <scott.a.garman@intel.com>2012-12-27 16:16:34 -0800
commit6d030fcb69221da073ce413049deb8447934bed5 (patch)
tree6f951a65c5518abeb0e8795daff6554dac778d6e /meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
parente6fddd1961061895e9335fa94b636163efdc9caa (diff)
downloadopenembedded-core-6d030fcb69221da073ce413049deb8447934bed5.tar.gz
openembedded-core-6d030fcb69221da073ce413049deb8447934bed5.tar.bz2
openembedded-core-6d030fcb69221da073ce413049deb8447934bed5.zip
librsvg: CVE-2011-3146
Store node type separately in RsvgNode commit 34c95743ca692ea0e44778e41a7c0a129363de84 upstream The node name (formerly RsvgNode:type) cannot be used to infer the sub-type of RsvgNode that we're dealing with, since for unknown elements we put type = node-name. This lead to a (potentially exploitable) crash e.g. when the element name started with "fe" which tricked the old code into considering it as a RsvgFilterPrimitive. http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2011-3146 https://bugzilla.gnome.org/show_bug.cgi?id=658014 [YOCTO #3581] [ CQID: WIND00376773 ] Upstream-Status: Backport Signed-off-by: Li Wang <li.wang@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Resolved merge conflicts with denzil branch. Fixes denzil bug [YOCTO #3651]. Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Diffstat (limited to 'meta/recipes-gnome/librsvg/librsvg_2.32.1.bb')
-rw-r--r--meta/recipes-gnome/librsvg/librsvg_2.32.1.bb6
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb b/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
index 1e57647cb3..ed2630ee0e 100644
--- a/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
+++ b/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
@@ -9,13 +9,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
SECTION = "x11/utils"
DEPENDS = "gtk+ libcroco cairo libxml2 popt"
-PR = "r5"
+PR = "r6"
inherit autotools pkgconfig gnome
EXTRA_OECONF = "--disable-mozilla-plugin --without-svgz --without-croco --disable-gnome-vfs"
-SRC_URI += "file://doc_Makefile.patch"
+SRC_URI += "file://doc_Makefile.patch \
+ file://librsvg-CVE-2011-3146.patch \
+ "
SRC_URI[archive.md5sum] = "4b00d0fee130c936644892c152f42db7"
SRC_URI[archive.sha256sum] = "91b98051f352fab8a6257688d6b2fd665b4648ed66144861f2f853ccf876d334"