mg.c - fix $+ combined with branch reset

I missed that $+ needs to do the parno_to_logical lookup.
We had tests for $^N, but not $+. This also fixes the code
for $^N to only do the lookup when the paren is not 0.

Fixes #20912

1 files changed, 12 insertions, 6 deletions

diff --git a/mg.c b/mg.c
index 25f6584a67..fa473a2e12 100644
--- a/mg.c
+++ b/mg.c
@@ -1141,20 +1141,26 @@ Perl_magic_get(pTHX_ SV *sv, MAGIC *mg)
             }
         }
         break;
-    case '+':
+    case '+':                   /* $+ */
         if (PL_curpm && (rx = PM_GETRE(PL_curpm))) {
             paren = RX_LASTPAREN(rx);
-            if (paren)
+            if (paren) {
+                I32 *parno_to_logical = RX_PARNO_TO_LOGICAL(rx);
+                if (parno_to_logical)
+                    paren = parno_to_logical[paren];
                 goto do_numbuf_fetch;
+            }
         }
         goto set_undef;
-    case '\016':		/* ^N */
+    case '\016':		/* $^N */
         if (PL_curpm && (rx = PM_GETRE(PL_curpm))) {
             paren = RX_LASTCLOSEPAREN(rx);
-            if (RX_PARNO_TO_LOGICAL(rx))
-                paren = RX_PARNO_TO_LOGICAL(rx)[paren];
-            if (paren)
+            if (paren) {
+                I32 *parno_to_logical = RX_PARNO_TO_LOGICAL(rx);
+                if (parno_to_logical)
+                    paren = parno_to_logical[paren];
                 goto do_numbuf_fetch;
+            }
         }
         goto set_undef;
     case '.':