Attachment 876237 Details for Bug 1078083 – patch from upstream

[patch] patch from upstream

heap-overflow.patch (text/plain), 2.90 KB, created by Murray McAllister on 2014-03-19 07:09:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Murray McAllister

Created: 2014-03-19 07:09:31 UTC

Size: 2.90 KB

patch

obsolete

>diff -r d7cb9c2731c0 CMakeLists.txt
>--- a/CMakeLists.txt	Mon Feb 03 23:42:24 2014 -0600
>+++ b/CMakeLists.txt	Fri Mar 14 17:52:43 2014 -0500
>@@ -5,7 +5,7 @@
> 
> set (YAML_VERSION_MAJOR 0)
> set (YAML_VERSION_MINOR 1)
>-set (YAML_VERSION_PATCH 4)
>+set (YAML_VERSION_PATCH 6)
> set (YAML_VERSION_STRING "${YAML_VERSION_MAJOR}.${YAML_VERSION_MINOR}.${YAML_VERSION_PATCH}")
> 
> file (GLOB SRC src/*.c)
>diff -r d7cb9c2731c0 configure.ac
>--- a/configure.ac	Mon Feb 03 23:42:24 2014 -0600
>+++ b/configure.ac	Fri Mar 14 17:52:43 2014 -0500
>@@ -3,7 +3,7 @@
> # Define the package version numbers and the bug reporting link.
> m4_define([YAML_MAJOR], 0)
> m4_define([YAML_MINOR], 1)
>-m4_define([YAML_PATCH], 5)
>+m4_define([YAML_PATCH], 6)
> m4_define([YAML_BUGS], [http://pyyaml.org/newticket?component=libyaml])
> 
> # Define the libtool version numbers; check the Autobook, Section 11.4.
>@@ -19,7 +19,7 @@
> #           YAML_AGE = 0
> m4_define([YAML_RELEASE], 0)
> m4_define([YAML_CURRENT], 2)
>-m4_define([YAML_REVISION], 3)
>+m4_define([YAML_REVISION], 4)
> m4_define([YAML_AGE], 0)
> 
> # Initialize autoconf & automake.
>diff -r d7cb9c2731c0 src/scanner.c
>--- a/src/scanner.c	Mon Feb 03 23:42:24 2014 -0600
>+++ b/src/scanner.c	Fri Mar 14 17:52:43 2014 -0500
>@@ -2629,6 +2629,9 @@
>         /* Check if it is a URI-escape sequence. */
> 
>         if (CHECK(parser->buffer, '%')) {
>+            if (!STRING_EXTEND(parser, string))
>+                goto error;
>+
>             if (!yaml_parser_scan_uri_escapes(parser,
>                         directive, start_mark, &string)) goto error;
>         }
>diff -r d7cb9c2731c0 src/yaml_private.h
>--- a/src/yaml_private.h	Mon Feb 03 23:42:24 2014 -0600
>+++ b/src/yaml_private.h	Fri Mar 14 17:52:43 2014 -0500
>@@ -143,9 +143,12 @@
>      (string).start = (string).pointer = (string).end = 0)
> 
> #define STRING_EXTEND(context,string)                                           \
>-    (((string).pointer+5 < (string).end)                                        \
>+    ((((string).pointer+5 < (string).end)                                       \
>         || yaml_string_extend(&(string).start,                                  \
>-            &(string).pointer, &(string).end))
>+            &(string).pointer, &(string).end)) ?                                \
>+         1 :                                                                    \
>+        ((context)->error = YAML_MEMORY_ERROR,                                  \
>+         0))
> 
> #define CLEAR(context,string)                                                   \
>     ((string).pointer = (string).start,                                         \
>diff -r d7cb9c2731c0 win32/config.h
>--- a/win32/config.h	Mon Feb 03 23:42:24 2014 -0600
>+++ b/win32/config.h	Fri Mar 14 17:52:43 2014 -0500
>@@ -1,4 +1,4 @@
> #define YAML_VERSION_MAJOR 0
> #define YAML_VERSION_MINOR 1
>-#define YAML_VERSION_PATCH 5
>-#define YAML_VERSION_STRING "0.1.5"
>+#define YAML_VERSION_PATCH 6
>+#define YAML_VERSION_STRING "0.1.6"

Actions: View | Diff

Attachments on bug 1078083: 876237