blob: 61fa7e5692e1d2d0d7696d5a3fbd2f696faa8c04 [file] [log] [blame]
Patrick Williamsc124f4f2015-09-15 14:41:29 -05001# HG changeset patch
2# User Kirill Simonov <xi@resolvent.net>
3# Date 1417197312 21600
4# Node ID 2b9156756423e967cfd09a61d125d883fca6f4f2
5# Parent 053f53a381ff6adbbc93a31ab7fdee06a16c8a33
6Removed invalid simple key assertion (thank to Jonathan Gray).
7
8The patch comes from
9
10https://bitbucket.org/xi/libyaml/commits/2b9156756423e967cfd09a61d125d883fca6f4f2
11
12Upstream-Status: Backport
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050013CVE: CVE-2014-9130
Patrick Williamsc124f4f2015-09-15 14:41:29 -050014
15Signed-off-by: Yue Tao <yue.tao@windriver.com>
16
17diff -r 053f53a381ff -r 2b9156756423 src/scanner.c
18--- a/src/scanner.c Wed Mar 26 13:55:54 2014 -0500
19+++ b/src/scanner.c Fri Nov 28 11:55:12 2014 -0600
20@@ -1106,13 +1106,6 @@
21 && parser->indent == (ptrdiff_t)parser->mark.column);
22
23 /*
24- * A simple key is required only when it is the first token in the current
25- * line. Therefore it is always allowed. But we add a check anyway.
26- */
27-
28- assert(parser->simple_key_allowed || !required); /* Impossible. */
29-
30- /*
31 * If the current position may start a simple key, save it.
32 */
33