Attachment #150557 for bug #195956

View | Details | Raw Unified | Return to bug 195956
Collapse All | Expand All

Lines 3-9 Link Here

(-)Makefile (-1 / +3 lines)
3		3
4	PORTNAME= libyaml	4	PORTNAME= libyaml
5	PORTVERSION= 0.1.6	5	PORTVERSION= 0.1.6
6	PORTREVISION= 1	6	PORTREVISION= 2
7	CATEGORIES= textproc	7	CATEGORIES= textproc
8	MASTER_SITES= http://pyyaml.org/download/libyaml/	8	MASTER_SITES= http://pyyaml.org/download/libyaml/
9	DISTNAME= yaml-${PORTVERSION}	9	DISTNAME= yaml-${PORTVERSION}
Lines 12-17 Link Here
12	MAINTAINER= jpaetzel@FreeBSD.org	12	MAINTAINER= jpaetzel@FreeBSD.org
13	COMMENT= YAML 1.1 parser and emitter written in C	13	COMMENT= YAML 1.1 parser and emitter written in C
14		14
		15	LICENSE= MIT
		16
15	GNU_CONFIGURE= yes	17	GNU_CONFIGURE= yes
16	INSTALL_TARGET= install-strip	18	INSTALL_TARGET= install-strip
17	USES= libtool pathfix	19	USES= libtool pathfix




--- src/scanner.c.orig	2014-03-27 03:54:02.000000000 +0900
+++ src/scanner.c	2014-12-14 10:07:35.636167929 +0900
@@ -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.
      */
 

Return to bug 195956

Line 0 Link Here

(-)files/patch-CVE-2014-9130 (+16 lines)
	1	--- src/scanner.c.orig 2014-03-27 03:54:02.000000000 +0900
	2	+++ src/scanner.c 2014-12-14 10:07:35.636167929 +0900
	3	@@ -1106,13 +1106,6 @@
	4	&& parser->indent == (ptrdiff_t)parser->mark.column);
	5
	6	/*
	7	- * A simple key is required only when it is the first token in the current
	8	- * line. Therefore it is always allowed. But we add a check anyway.
	9	- */
	10	-
	11	- assert(parser->simple_key_allowed \|\| !required); /* Impossible. */
	12	-
	13	- /*
	14	* If the current position may start a simple key, save it.
	15	*/
	16