[prev in list] [next in list] [prev in thread] [next in thread] 

List:       php-cvs
Subject:    [PHP-CVS] com php-src: Patch from the upstream git https://github.com/kkos/oniguruma/issues/60 (CVE-
From:       Remi Collet <remi () php ! net>
Date:       2017-05-30 13:40:32
Message-ID: php-mail-039fdfdff7f2b639c70626afdf18cb1e894408250 () git ! php ! net
[Download RAW message or body]

Commit:    1c845d295037702d63097e2216b3c5db53f79273
Author:    Remi Collet <remi@php.net>         Tue, 30 May 2017 15:40:32 +0200
Parents:   5416deec665db293ae25548828791453d776a6bf
Branches:  PHP-7.0

Link:       http://git.php.net/?p=php-src.git;a=commitdiff;h=1c845d295037702d63097e2216b3c5db53f79273

Log:
Patch from the upstream git
https://github.com/kkos/oniguruma/issues/60 (CVE-2017-9228)

Thanks to Mamoru TASAKA <mtasaka@fedoraproject.org>

Changed paths:
  M  ext/mbstring/oniguruma/regparse.c


Diff:
diff --git a/ext/mbstring/oniguruma/regparse.c b/ext/mbstring/oniguruma/regparse.c
index c6822e6..d2925f1 100644
--- a/ext/mbstring/oniguruma/regparse.c
+++ b/ext/mbstring/oniguruma/regparse.c
@@ -4068,7 +4068,9 @@ next_state_class(CClassNode* cc, OnigCodePoint* vs, enum CCVALTYPE* type,
     }
   }
 
-  *state = CCS_VALUE;
+  if (*state != CCS_START)
+    *state = CCS_VALUE;
+
   *type  = CCV_CLASS;
   return 0;
 }


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[prev in list] [next in list] [prev in thread] [next in thread]