diff options
| author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2015-06-04 13:19:03 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-11 23:38:03 +0100 |
| commit | 9c8679acb6e611d2fa6e51299b856394da9ea98d (patch) | |
| tree | 225b62a3a22b4d1c680e3159020e39493d9c1980 /meta/recipes-support/libyaml/files | |
| parent | 6c33bad0284a2958c45e007e76d615354269bc9d (diff) | |
| download | openembedded-core-9c8679acb6e611d2fa6e51299b856394da9ea98d.tar.gz openembedded-core-9c8679acb6e611d2fa6e51299b856394da9ea98d.tar.bz2 openembedded-core-9c8679acb6e611d2fa6e51299b856394da9ea98d.zip | |
libyaml: add a recipe from meta-oe
libyaml is a dependency of ruby
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Diffstat (limited to 'meta/recipes-support/libyaml/files')
| -rw-r--r-- | meta/recipes-support/libyaml/files/libyaml-CVE-2014-9130.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/meta/recipes-support/libyaml/files/libyaml-CVE-2014-9130.patch b/meta/recipes-support/libyaml/files/libyaml-CVE-2014-9130.patch new file mode 100644 index 0000000000..3c4a00ef3e --- /dev/null +++ b/meta/recipes-support/libyaml/files/libyaml-CVE-2014-9130.patch @@ -0,0 +1,32 @@ +# HG changeset patch +# User Kirill Simonov <xi@resolvent.net> +# Date 1417197312 21600 +# Node ID 2b9156756423e967cfd09a61d125d883fca6f4f2 +# Parent 053f53a381ff6adbbc93a31ab7fdee06a16c8a33 +Removed invalid simple key assertion (thank to Jonathan Gray). + +The patch comes from + +https://bitbucket.org/xi/libyaml/commits/2b9156756423e967cfd09a61d125d883fca6f4f2 + +Upstream-Status: Backport + +Signed-off-by: Yue Tao <yue.tao@windriver.com> + +diff -r 053f53a381ff -r 2b9156756423 src/scanner.c +--- a/src/scanner.c Wed Mar 26 13:55:54 2014 -0500 ++++ b/src/scanner.c Fri Nov 28 11:55:12 2014 -0600 +@@ -1106,13 +1106,6 @@ + && parser->indent == (ptrdiff_t)parser->mark.column); + + /* +- * A simple key is required only when it is the first token in the current +- * line. Therefore it is always allowed. But we add a check anyway. +- */ +- +- assert(parser->simple_key_allowed || !required); /* Impossible. */ +- +- /* + * If the current position may start a simple key, save it. + */ + |