From 26f7732166c181c0e9b0fba5b63f394986de061b Mon Sep 17 00:00:00 2001 From: Gary Thomas Date: Tue, 20 Jan 2015 09:50:35 -0700 Subject: 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 Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- .../perl/perl-5.20.0/fix-FF_MORE-crash.patch | 21 +++++++++++++++++++++ meta/recipes-devtools/perl/perl_5.20.0.bb | 1 + 2 files changed, 22 insertions(+) create mode 100644 meta/recipes-devtools/perl/perl-5.20.0/fix-FF_MORE-crash.patch (limited to 'meta/recipes-devtools/perl') 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 @@ +Upstream-Status: Backport +Reference: https://rt.perl.org/Public/Bug/Display.html?id=123591 + From 62db6ea5fed19611596cbc5fc0b8a4df2c604e58 Mon Sep 17 00:00:00 2001 + From: Tony Cook + Date: Mon, 19 Jan 2015 16:03:18 +1100 + Subject: [PATCH 1/1] [perl #123538] always set chophere and itembytes at the same time + + Previously this would crash in FF_MORE because chophere was still NULL. + +Signed-off-by: Gary Thomas +Index: perl-5.20.0/pp_ctl.c +=================================================================== +--- perl-5.20.0.orig/pp_ctl.c ++++ perl-5.20.0/pp_ctl.c +@@ -590,6 +590,7 @@ PP(pp_formline) + break; + } + itembytes = s - item; ++ chophere = s; + break; + } 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 += " \ file://fix_bad_rpath.patch \ file://perl-archlib-exp.patch \ file://dynaloaderhack.patch \ + file://fix-FF_MORE-crash.patch \ \ \ file://config.sh \ -- cgit 1.2.3-korg