summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2022-05-10 13:32:24 +0100
committerBram Moolenaar <Bram@vim.org>2022-05-10 13:32:24 +0100
commit0f267621c04883de010a6379217a5f182cc03dda (patch)
tree7b2a18494084e0ffbf2802e09df83cd363f6820e
parent0abc2871c105882ed1c1effb9a7757fad8a395bd (diff)
patch 8.2.4931: Crash with sequence of Perl commandsv8.2.4931
Problem: Crash with sequence of Perl commands. Solution: Move PUTBACK to another line. (closes #10386)
-rw-r--r--src/if_perl.xs2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/if_perl.xs b/src/if_perl.xs
index c7177700ff..1afb1d4cf1 100644
--- a/src/if_perl.xs
+++ b/src/if_perl.xs
@@ -1373,6 +1373,7 @@ do_perleval(char_u *str, typval_T *rettv)
SPAGAIN;
SvREFCNT_dec(sv);
sv = POPs;
+ PUTBACK;
}
}
else
@@ -1383,7 +1384,6 @@ do_perleval(char_u *str, typval_T *rettv)
ref_map_free();
err = SvPV(GvSV(PL_errgv), err_len);
}
- PUTBACK;
FREETMPS;
LEAVE;
}
diff --git a/src/version.c b/src/version.c
index 0a08909cbf..97fbf1717f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 4931,
+/**/
4930,
/**/
4929,