File 4097828d7cc87589864fecf452f2cd46c5f37180.patch of Package oniguruma.34712

Overview Repositories Revisions Requests Users Attributes Meta

File 4097828d7cc87589864fecf452f2cd46c5f37180.patch of Package oniguruma.34712

From 4097828d7cc87589864fecf452f2cd46c5f37180 Mon Sep 17 00:00:00 2001
From: "K.Kosako" <kosako@sofnec.co.jp>
Date: Mon, 29 Jul 2019 12:52:56 +0900
Subject: [PATCH] fix #147: Stack Exhaustion Problem caused by some parsing
 functions in regcomp.c making recursive calls to themselves.

---
 src/regparse.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

Index: onig-6.7.0/src/regparse.c
===================================================================
--- onig-6.7.0.orig/src/regparse.c
+++ onig-6.7.0/src/regparse.c
@@ -5197,6 +5197,7 @@ parse_char_class(Node** np, OnigToken* t
   env->parse_depth++;
   if (env->parse_depth > ParseDepthLimit)
     return ONIGERR_PARSE_DEPTH_LIMIT_OVER;
+
   prev_cc = (CClassNode* )NULL;
   r = fetch_token_in_cc(tok, src, end, env);
   if (r == TK_CHAR && tok->u.c == '^' && tok->escaped == 0) {
@@ -6230,14 +6231,18 @@ static int
 parse_exp(Node** np, OnigToken* tok, int term, UChar** src, UChar* end,
           ScanEnv* env)
 {
-  int r, len, group = 0;
+  int r, len, group;
   Node* qn;
   Node** targetp;
+  unsigned int parse_depth;
 
+  group = 0;
   *np = NULL;
   if (tok->type == (enum TokenSyms )term)
     goto end_of_token;
 
+  parse_depth = env->parse_depth;
+
   switch (tok->type) {
   case TK_ALT:
   case TK_EOT:
@@ -6544,6 +6549,10 @@ parse_exp(Node** np, OnigToken* tok, int
       if (is_invalid_quantifier_target(*targetp))
         return ONIGERR_TARGET_OF_REPEAT_OPERATOR_INVALID;
 
+      parse_depth++;
+      if (parse_depth > ParseDepthLimit)
+        return ONIGERR_PARSE_DEPTH_LIMIT_OVER;
+
       qn = node_new_quantifier(tok->u.repeat.lower, tok->u.repeat.upper,
                                (r == TK_INTERVAL ? 1 : 0));
       CHECK_NULL_RETURN_MEMERR(qn);

Places

File 4097828d7cc87589864fecf452f2cd46c5f37180.patch of Package oniguruma.34712

Places