summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorGary Thomas <gary@mlbassoc.com>2015-01-20 09:50:35 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-01-23 11:36:28 +0000
commit26f7732166c181c0e9b0fba5b63f394986de061b (patch)
tree986b867f27298f55faf3f97ed1ae446c118cdd2c /meta/recipes-devtools
parent817606a90fc8c915a95aee9de6096ca2c88522ee (diff)
downloadpoky-26f7732166c181c0e9b0fba5b63f394986de061b.tar.gz
perl: Backport fix for bug #123591
This patch fixes a crash in perl when using formatted strings @... (From OE-Core rev: 6ff3776bb7f1a7ba2fc641bfd9b8546c4bb02466) Signed-off-by: Gary Thomas <gary@mlbassoc.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')
-rw-r--r--meta/recipes-devtools/perl/perl-5.20.0/fix-FF_MORE-crash.patch21
-rw-r--r--meta/recipes-devtools/perl/perl_5.20.0.bb1
2 files changed, 22 insertions, 0 deletions
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/fix-FF_MORE-crash.patch b/meta/recipes-devtools/perl/perl-5.20.0/fix-FF_MORE-crash.patch
new file mode 100644
index 0000000000..9ec041c833
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl-5.20.0/fix-FF_MORE-crash.patch
@@ -0,0 +1,21 @@
1Upstream-Status: Backport
2Reference: https://rt.perl.org/Public/Bug/Display.html?id=123591
3 From 62db6ea5fed19611596cbc5fc0b8a4df2c604e58 Mon Sep 17 00:00:00 2001
4 From: Tony Cook <tony@develop-help.com>
5 Date: Mon, 19 Jan 2015 16:03:18 +1100
6 Subject: [PATCH 1/1] [perl #123538] always set chophere and itembytes at the same time
7
8 Previously this would crash in FF_MORE because chophere was still NULL.
9
10Signed-off-by: Gary Thomas <gary@mlbassoc.com>
11Index: perl-5.20.0/pp_ctl.c
12===================================================================
13--- perl-5.20.0.orig/pp_ctl.c
14+++ perl-5.20.0/pp_ctl.c
15@@ -590,6 +590,7 @@ PP(pp_formline)
16 break;
17 }
18 itembytes = s - item;
19+ chophere = s;
20 break;
21 }
diff --git a/meta/recipes-devtools/perl/perl_5.20.0.bb b/meta/recipes-devtools/perl/perl_5.20.0.bb
index c1766fc377..db65202ec8 100644
--- a/meta/recipes-devtools/perl/perl_5.20.0.bb
+++ b/meta/recipes-devtools/perl/perl_5.20.0.bb
@@ -63,6 +63,7 @@ SRC_URI += " \
63 file://fix_bad_rpath.patch \ 63 file://fix_bad_rpath.patch \
64 file://perl-archlib-exp.patch \ 64 file://perl-archlib-exp.patch \
65 file://dynaloaderhack.patch \ 65 file://dynaloaderhack.patch \
66 file://fix-FF_MORE-crash.patch \
66 \ 67 \
67 \ 68 \
68 file://config.sh \ 69 file://config.sh \