Attachment 150557 Details for Bug 195956 – Add patch to fix CVE-2014-9130 and LICENSE.

[patch] Add patch to fix CVE-2014-9130 and LICENSE.

patch-textproc_libyaml (text/plain), 1.60 KB, created by Yasuhiro Kimura on 2014-12-14 01:39:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yasuhiro Kimura

Created: 2014-12-14 01:39:13 UTC

Size: 1.60 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 374612)
>+++ Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	libyaml
> PORTVERSION=	0.1.6
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	textproc
> MASTER_SITES=	http://pyyaml.org/download/libyaml/
> DISTNAME=	yaml-${PORTVERSION}
>@@ -12,6 +12,8 @@
> MAINTAINER=	jpaetzel@FreeBSD.org
> COMMENT=	YAML 1.1 parser and emitter written in C
> 
>+LICENSE=	MIT
>+
> GNU_CONFIGURE=	yes
> INSTALL_TARGET=	install-strip
> USES=		libtool pathfix
>Index: files/patch-CVE-2014-9130
>===================================================================
>--- files/patch-CVE-2014-9130	(revision 0)
>+++ files/patch-CVE-2014-9130	(working copy)
>@@ -0,0 +1,16 @@
>+--- 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.
>+      */
>+ 
>
>Property changes on: files/patch-CVE-2014-9130
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 195956: 150557