From: Anders Kaseorg <andersk@mit.edu>
Date: Sat, 29 Nov 2014 02:15:51 +0000 (-0500)
Subject: Fix CVE-2014-9130 assertion failure caused by wrapped strings
X-Git-Tag: debian/0.1.6-3~2
X-Git-Url: http://andersk.mit.edu/gitweb/libyaml.git/commitdiff_plain/6ecaf9495d6109140b733def17417b85e85cc2d3

Fix CVE-2014-9130 assertion failure caused by wrapped strings

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
---

diff --git a/debian/changelog b/debian/changelog
index b22496b..a9c5a50 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libyaml (0.1.6-3) UNRELEASED; urgency=high
+
+  * debian/patches/CVE-2014-9130.patch: Fix CVE-2014-9130 assertion
+    failure caused by wrapped strings.  (Closes: #771366)
+
+ -- Anders Kaseorg <andersk@mit.edu>  Fri, 28 Nov 2014 21:14:24 -0500
+
 libyaml (0.1.6-2) unstable; urgency=medium
 
   * Move doxygen from Build-Depends to Build-Depends-Indep.
diff --git a/debian/patches/CVE-2014-9130.patch b/debian/patches/CVE-2014-9130.patch
new file mode 100644
index 0000000..0160618
--- /dev/null
+++ b/debian/patches/CVE-2014-9130.patch
@@ -0,0 +1,32 @@
+From: Kirill Simonov <xi@resolvent.net>
+Subject: Removed invalid simple key assertion (thank to Jonathan Gray).
+Origin: upstream, https://bitbucket.org/xi/libyaml/commits/2b9156756423e967cfd09a61d125d883fca6f4f2
+Bug: https://bitbucket.org/xi/libyaml/issue/10
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=771366
+Last-Update: 2014-11-28
+
+---
+ src/scanner.c | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/src/scanner.c b/src/scanner.c
+index 88d4fa5..5ec0be0 100644
+--- a/src/scanner.c
++++ b/src/scanner.c
+@@ -1106,13 +1106,6 @@ yaml_parser_save_simple_key(yaml_parser_t *parser)
+             && 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.
+      */
+ 
+-- 
+2.2.0
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..bd38a0a
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+CVE-2014-9130.patch