patch 8.2.4931: Crash with sequence of Perl commands

Problem:    Crash with sequence of Perl commands.
Solution:   Move PUTBACK to another line. (closes #10386)

diff --git a/src/if_perl.xs b/src/if_perl.xs
index c7177700ff41ead7d676006619df0c125abd52eb..1afb1d4cf101d229f89ca138119d5d29fc15ccba 100644 (file)
--- 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 0a08909cbf037d222325d820c61f438a17d815d4..97fbf1717fa84c5ac421612bdfabca4ab3666341 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -746,6 +746,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    4931,
 /**/
     4930,
 /**/