Ultrix mmap tidbit.

[p5sagit/p5-mst-13.2.git] / pp_hot.c

diff --git a/pp_hot.c b/pp_hot.c
index b538427..f304e8b 100644 (file)
--- a/pp_hot.c
+++ b/pp_hot.c
@@ -655,7 +655,7 @@ PP(pp_aassign)
                    if (SvSMAGICAL(sv))
                        mg_set(sv);
                    if (!didstore)
-                       SvREFCNT_dec(sv);
+                       sv_2mortal(sv);
                }
                TAINT_NOT;
            }
@@ -682,7 +682,7 @@ PP(pp_aassign)
                        if (SvSMAGICAL(tmpstr))
                            mg_set(tmpstr);
                        if (!didstore)
-                           SvREFCNT_dec(tmpstr);
+                           sv_2mortal(tmpstr);
                    }
                    TAINT_NOT;
                }
@@ -704,7 +704,7 @@ PP(pp_aassign)
                            if (SvSMAGICAL(tmpstr))
                                mg_set(tmpstr);
                            if (!didstore)
-                               SvREFCNT_dec(tmpstr);
+                               sv_2mortal(tmpstr);
                        }
                        TAINT_NOT;
                    }
@@ -844,6 +844,7 @@ PP(pp_match)
     I32 minmatch = 0;
     I32 oldsave = PL_savestack_ix;
     I32 update_minmatch = 1;
+    I32 had_zerolen = 0;
 
     if (PL_op->op_flags & OPf_STACKED)
        TARG = POPs;
@@ -881,7 +882,8 @@ PP(pp_match)
        if (SvTYPE(TARG) >= SVt_PVMG && SvMAGIC(TARG)) {
            MAGIC* mg = mg_find(TARG, 'g');
            if (mg && mg->mg_len >= 0) {
-               rx->endp[0] = rx->startp[0] = s + mg->mg_len; 
+               if (!(rx->reganch & ROPT_GPOS_SEEN))
+                   rx->endp[0] = rx->startp[0] = s + mg->mg_len; 
                minmatch = (mg->mg_flags & MGf_MINMATCH);
                update_minmatch = 0;
            }
@@ -906,7 +908,7 @@ play_it_again:
        if ((s + rx->minlen) > strend)
            goto nope;
        if (update_minmatch++)
-           minmatch = (s == rx->startp[0]);
+           minmatch = had_zerolen;
     }
     if (rx->check_substr) {
        if (!(rx->reganch & ROPT_NOSCAN)) { /* Floating checkstring. */
@@ -992,8 +994,7 @@ play_it_again:
        if (global) {
            truebase = rx->subbeg;
            strend = rx->subend;
-           if (rx->startp[0] && rx->startp[0] == rx->endp[0])
-               ++rx->endp[0];
+           had_zerolen = (rx->startp[0] && rx->startp[0] == rx->endp[0]);
            PUTBACK;                    /* EVAL blocks may use stack */
            r_flags |= REXEC_IGNOREPOS;
            goto play_it_again;