diff options
author | Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com> | 2017-10-12 11:35:23 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-11-05 22:33:21 +0000 |
commit | 36ba73e495a3f4e75a1be813fb73b5ad27990784 (patch) | |
tree | 734e1e21fa8077a328fab0d9c06a1e95152a834d /meta/recipes-devtools/ruby/ruby | |
parent | ae2a0017109581f8ceb03c97a84a831634f77b06 (diff) | |
download | poky-36ba73e495a3f4e75a1be813fb73b5ad27990784.tar.gz |
ruby: upgrade to 2.4.2
The CVE-2017-14064 patch is already at 2.4.2 as explained on
project's commit, so removing from the recipe & repo.
commit 83735ba29a0bfdaffa8e9c2a1dc025c3b0b63153
Author: hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed Apr 12 00:21:18 2017 +0000
Merge json-2.0.4.
* https://github.com/flori/json/releases/tag/v2.0.4
* https://github.com/flori/json/blob/09fabeb03e73ed88dc8ce8f19d76ac59e51dae20/CHANGES.md#2017-03-23-204
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58323 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
(From OE-Core rev: 6e37a88af155d5e5453fb0f44bb11d6f8e406438)
Signed-off-by: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/ruby/ruby')
-rw-r--r-- | meta/recipes-devtools/ruby/ruby/ruby-CVE-2017-14064.patch | 87 |
1 files changed, 0 insertions, 87 deletions
diff --git a/meta/recipes-devtools/ruby/ruby/ruby-CVE-2017-14064.patch b/meta/recipes-devtools/ruby/ruby/ruby-CVE-2017-14064.patch deleted file mode 100644 index 88e693c94e..0000000000 --- a/meta/recipes-devtools/ruby/ruby/ruby-CVE-2017-14064.patch +++ /dev/null | |||
@@ -1,87 +0,0 @@ | |||
1 | From 8f782fd8e181d9cfe9387ded43a5ca9692266b85 Mon Sep 17 00:00:00 2001 | ||
2 | From: Florian Frank <flori@ping.de> | ||
3 | Date: Thu, 2 Mar 2017 12:12:33 +0100 | ||
4 | Subject: [PATCH] Fix arbitrary heap exposure problem | ||
5 | |||
6 | Upstream-Status: Backport | ||
7 | CVE: CVE-2017-14064 | ||
8 | |||
9 | Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> | ||
10 | --- | ||
11 | ext/json/generator/generator.c | 12 ++++++------ | ||
12 | ext/json/generator/generator.h | 1 - | ||
13 | 2 files changed, 6 insertions(+), 7 deletions(-) | ||
14 | |||
15 | diff --git a/ext/json/generator/generator.c b/ext/json/generator/generator.c | ||
16 | index ef85bb7..c88818c 100644 | ||
17 | --- a/ext/json/generator/generator.c | ||
18 | +++ b/ext/json/generator/generator.c | ||
19 | @@ -308,7 +308,7 @@ static char *fstrndup(const char *ptr, unsigned long len) { | ||
20 | char *result; | ||
21 | if (len <= 0) return NULL; | ||
22 | result = ALLOC_N(char, len); | ||
23 | - memccpy(result, ptr, 0, len); | ||
24 | + memcpy(result, ptr, len); | ||
25 | return result; | ||
26 | } | ||
27 | |||
28 | @@ -1062,7 +1062,7 @@ static VALUE cState_indent_set(VALUE self, VALUE indent) | ||
29 | } | ||
30 | } else { | ||
31 | if (state->indent) ruby_xfree(state->indent); | ||
32 | - state->indent = strdup(RSTRING_PTR(indent)); | ||
33 | + state->indent = fstrndup(RSTRING_PTR(indent), len); | ||
34 | state->indent_len = len; | ||
35 | } | ||
36 | return Qnil; | ||
37 | @@ -1100,7 +1100,7 @@ static VALUE cState_space_set(VALUE self, VALUE space) | ||
38 | } | ||
39 | } else { | ||
40 | if (state->space) ruby_xfree(state->space); | ||
41 | - state->space = strdup(RSTRING_PTR(space)); | ||
42 | + state->space = fstrndup(RSTRING_PTR(space), len); | ||
43 | state->space_len = len; | ||
44 | } | ||
45 | return Qnil; | ||
46 | @@ -1136,7 +1136,7 @@ static VALUE cState_space_before_set(VALUE self, VALUE space_before) | ||
47 | } | ||
48 | } else { | ||
49 | if (state->space_before) ruby_xfree(state->space_before); | ||
50 | - state->space_before = strdup(RSTRING_PTR(space_before)); | ||
51 | + state->space_before = fstrndup(RSTRING_PTR(space_before), len); | ||
52 | state->space_before_len = len; | ||
53 | } | ||
54 | return Qnil; | ||
55 | @@ -1173,7 +1173,7 @@ static VALUE cState_object_nl_set(VALUE self, VALUE object_nl) | ||
56 | } | ||
57 | } else { | ||
58 | if (state->object_nl) ruby_xfree(state->object_nl); | ||
59 | - state->object_nl = strdup(RSTRING_PTR(object_nl)); | ||
60 | + state->object_nl = fstrndup(RSTRING_PTR(object_nl), len); | ||
61 | state->object_nl_len = len; | ||
62 | } | ||
63 | return Qnil; | ||
64 | @@ -1208,7 +1208,7 @@ static VALUE cState_array_nl_set(VALUE self, VALUE array_nl) | ||
65 | } | ||
66 | } else { | ||
67 | if (state->array_nl) ruby_xfree(state->array_nl); | ||
68 | - state->array_nl = strdup(RSTRING_PTR(array_nl)); | ||
69 | + state->array_nl = fstrndup(RSTRING_PTR(array_nl), len); | ||
70 | state->array_nl_len = len; | ||
71 | } | ||
72 | return Qnil; | ||
73 | diff --git a/ext/json/generator/generator.h b/ext/json/generator/generator.h | ||
74 | index 900b4d5..c367a62 100644 | ||
75 | --- a/ext/json/generator/generator.h | ||
76 | +++ b/ext/json/generator/generator.h | ||
77 | @@ -1,7 +1,6 @@ | ||
78 | #ifndef _GENERATOR_H_ | ||
79 | #define _GENERATOR_H_ | ||
80 | |||
81 | -#include <string.h> | ||
82 | #include <math.h> | ||
83 | #include <ctype.h> | ||
84 | |||
85 | -- | ||
86 | 2.10.2 | ||
87 | |||