blob: f6eaefb7fdd44ddb776b8acb4c4a1e6729db4a33 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
|
commit 9690d3ab1f9bcd2db8cbe1fe3ee4a5da606b8814
Author: K.Kosako <kosako@sofnec.co.jp>
Date: Tue May 23 16:15:35 2017 +0900
fix #58 : access to invalid address by reg->dmin value
Upstream-Status: backport
CVE: CVE-2017-9227
Signed-off-by: Thiruvadi Rajaraman <trajaraman@mvista.com>
Index: ruby-2.2.5/regexec.c
===================================================================
--- ruby-2.2.5.orig/regexec.c 2014-09-15 21:48:41.000000000 +0530
+++ ruby-2.2.5/regexec.c 2017-08-30 12:18:04.054828426 +0530
@@ -3678,6 +3678,8 @@
}
else {
UChar *q = p + reg->dmin;
+
+ if (q >= end) return 0; /* fail */
while (p < q) p += enclen(reg->enc, p, end);
}
}
|