aboutsummaryrefslogtreecommitdiffstats
path: root/main/yaml/CVE-2014-9130.patch
diff options
context:
space:
mode:
Diffstat (limited to 'main/yaml/CVE-2014-9130.patch')
-rw-r--r--main/yaml/CVE-2014-9130.patch28
1 files changed, 0 insertions, 28 deletions
diff --git a/main/yaml/CVE-2014-9130.patch b/main/yaml/CVE-2014-9130.patch
deleted file mode 100644
index 00e15f32b4..0000000000
--- a/main/yaml/CVE-2014-9130.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From e6aa721cc0e5a48f408c52355559fd36780ba32a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ingy=20d=C3=B6t=20Net?= <ingy@ingy.net>
-Date: Fri, 28 Nov 2014 09:21:49 -0800
-Subject: [PATCH] Fix for https://bitbucket.org/xi/libyaml/issue/10/
-
-https://bitbucket.org/xi/libyaml/issue/10/wrapped-strings-cause-assert-failure
-
-Commenting out the assert makes the scanner do the right thing and
-results in just a simple parse failure.
----
- src/scanner.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/scanner.c b/src/scanner.c
-index 88d4fa5..c5f3d2f 100644
---- a/src/scanner.c
-+++ b/src/scanner.c
-@@ -1110,7 +1110,9 @@ yaml_parser_save_simple_key(yaml_parser_t *parser)
- * line. Therefore it is always allowed. But we add a check anyway.
- */
-
-- assert(parser->simple_key_allowed || !required); /* Impossible. */
-+ /* XXX This caused:
-+ * https://bitbucket.org/xi/libyaml/issue/10/wrapped-strings-cause-assert-failure
-+ assert(parser->simple_key_allowed || !required); */ /* Impossible. */
-
- /*
- * If the current position may start a simple key, save it.