mirror of
https://git.yoctoproject.org/poky
synced 2026-02-10 02:33:02 +01:00
e5c011b041
The currnet patches in OE-core doesn't have the "CVE:" tag, now part of the policy of the patches. This is patch add this tag to several patches. There might be patches that I miss; the tag can be added in the future. (From OE-Core rev: 065ebeb3e15311d0d45385e15bf557b1c95b1669) Signed-off-by: Mariano Lopez <mariano.lopez@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
34 lines
1.0 KiB
Diff
34 lines
1.0 KiB
Diff
# 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
|
|
CVE: CVE-2014-9130
|
|
|
|
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.
|
|
*/
|
|
|