From: Remi Collet <remi@php.net>
Date: Tue, 8 Jan 2019 08:33:41 +0000 (+0100)
Subject: cleanup merge
X-Git-Tag: php-7.3.2RC1~37^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0d9935739c3a035f74b54aa518f2497975402864;p=php

cleanup merge
---

diff --git a/ext/mbstring/oniguruma/src/regparse.c b/ext/mbstring/oniguruma/src/regparse.c
index 0c0b07804b..1904880eff 100644
--- a/ext/mbstring/oniguruma/src/regparse.c
+++ b/ext/mbstring/oniguruma/src/regparse.c
@@ -3596,7 +3596,6 @@ fetch_token(OnigToken* tok, UChar** src, UChar* end, ScanEnv* env)
           tok->u.code = c2;
         }
         else { /* string */
-          p = tok->backp + enclen(enc, tok->backp);
           int len;
           SAFE_ENC_LEN(enc, tok->backp, end, len);
           p = tok->backp + len;