Attachment #195054 for bug #229703

View | Details | Raw Unified | Return to bug 229703
Collapse All | Expand All

Lines 2-9 Link Here

(-)Makefile (-2 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= pcre2	4	PORTNAME= pcre2
5	PORTVERSION= 10.21	5	PORTVERSION= 10.31
6	PORTREVISION= 1
7	CATEGORIES= devel	6	CATEGORIES= devel
8	MASTER_SITES= SF/pcre/${PORTNAME}/${PORTVERSION} \	7	MASTER_SITES= SF/pcre/${PORTNAME}/${PORTVERSION} \
9	ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/ \	8	ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/ \

Lines 1-2 Link Here

(-)distinfo (-2 / +3 lines)
1	SHA256 (pcre2-10.21.tar.gz) = 1cfd43caffe07fe7f2cfafc74c8f0d87b38d80bbb63226a1193407476508e317	1	TIMESTAMP = 1531321198
2	SIZE (pcre2-10.21.tar.gz) = 1943713	2	SHA256 (pcre2-10.31.tar.gz) = e11ebd99dd23a7bccc9127d95d9978101b5f3cf0a6e7d25a1b1ca165a97166c4
		3	SIZE (pcre2-10.31.tar.gz) = 2130574




--- src/pcre2_compile.c	2016/02/06 16:40:59	488
+++ src/pcre2_compile.c	2016/02/10 18:24:02	489
@@ -5901,10 +5901,22 @@
               goto FAILED;
               }
             cb->had_accept = TRUE;
+            
+            /* In the first pass, just accumulate the length required;
+            otherwise hitting (*ACCEPT) inside many nested parentheses can
+            cause workspace overflow. */
+              
             for (oc = cb->open_caps; oc != NULL; oc = oc->next)
               {
-              *code++ = OP_CLOSE;
-              PUT2INC(code, 0, oc->number);
+              if (lengthptr != NULL)
+                {
+                *lengthptr += CU2BYTES(1) + IMM2_SIZE; 
+                }
+              else
+                {       
+                *code++ = OP_CLOSE;
+                PUT2INC(code, 0, oc->number);
+                } 
               }
             setverb = *code++ =
               (cb->assert_depth > 0)? OP_ASSERT_ACCEPT : OP_ACCEPT;




lib/libpcre2-16.a
lib/libpcre2-16.so
lib/libpcre2-16.so.0
lib/libpcre2-16.so.0.7.0
lib/libpcre2-32.a
lib/libpcre2-32.so
lib/libpcre2-32.so.0
lib/libpcre2-32.so.0.7.0
lib/libpcre2-8.a
lib/libpcre2-8.so
lib/libpcre2-8.so.0
lib/libpcre2-8.so.0.7.0
lib/libpcre2-posix.a
lib/libpcre2-posix.so
lib/libpcre2-posix.so.2
lib/libpcre2-posix.so.2.0.0
libdata/pkgconfig/libpcre2-16.pc
libdata/pkgconfig/libpcre2-32.pc
libdata/pkgconfig/libpcre2-8.pc

man/man1/pcre2test.1.gz
man/man3/pcre2.3.gz
man/man3/pcre2_callout_enumerate.3.gz
man/man3/pcre2_code_copy.3.gz
man/man3/pcre2_code_copy_with_tables.3.gz
man/man3/pcre2_code_free.3.gz
man/man3/pcre2_compile.3.gz
man/man3/pcre2_compile_context_copy.3.gz

man/man3/pcre2_compile_context_create.3.gz
man/man3/pcre2_compile_context_free.3.gz
man/man3/pcre2_config.3.gz
man/man3/pcre2_convert_context_copy.3.gz
man/man3/pcre2_convert_context_create.3.gz
man/man3/pcre2_convert_context_free.3.gz
man/man3/pcre2_converted_pattern_free.3.gz
man/man3/pcre2_dfa_match.3.gz
man/man3/pcre2_general_context_copy.3.gz
man/man3/pcre2_general_context_create.3.gz

man/man3/pcre2_match_data_create.3.gz
man/man3/pcre2_match_data_create_from_pattern.3.gz
man/man3/pcre2_match_data_free.3.gz
man/man3/pcre2_pattern_convert.3.gz
man/man3/pcre2_pattern_info.3.gz
man/man3/pcre2_serialize_decode.3.gz
man/man3/pcre2_serialize_encode.3.gz

man/man3/pcre2_set_bsr.3.gz
man/man3/pcre2_set_callout.3.gz
man/man3/pcre2_set_character_tables.3.gz
man/man3/pcre2_set_compile_extra_options.3.gz
man/man3/pcre2_set_compile_recursion_guard.3.gz
man/man3/pcre2_set_depth_limit.3.gz
man/man3/pcre2_set_glob_escape.3.gz
man/man3/pcre2_set_glob_separator.3.gz
man/man3/pcre2_set_heap_limit.3.gz
man/man3/pcre2_set_match_limit.3.gz
man/man3/pcre2_set_max_pattern_length.3.gz
man/man3/pcre2_set_newline.3.gz
man/man3/pcre2_set_offset_limit.3.gz
man/man3/pcre2_set_parens_nest_limit.3.gz

man/man3/pcre2build.3.gz
man/man3/pcre2callout.3.gz
man/man3/pcre2compat.3.gz
man/man3/pcre2convert.3.gz
man/man3/pcre2demo.3.gz
man/man3/pcre2jit.3.gz
man/man3/pcre2limits.3.gz

man/man3/pcre2posix.3.gz
man/man3/pcre2sample.3.gz
man/man3/pcre2serialize.3.gz
man/man3/pcre2stack.3.gz
man/man3/pcre2syntax.3.gz
man/man3/pcre2unicode.3.gz

Return to bug 229703

Lines 1-27 Link Here

(-)files/patch-CVE-2016-3191 (-27 lines)
1	--- src/pcre2_compile.c 2016/02/06 16:40:59 488
2	+++ src/pcre2_compile.c 2016/02/10 18:24:02 489
3	@@ -5901,10 +5901,22 @@
4	goto FAILED;
5	}
6	cb->had_accept = TRUE;
7	+
8	+ /* In the first pass, just accumulate the length required;
9	+ otherwise hitting (*ACCEPT) inside many nested parentheses can
10	+ cause workspace overflow. */
11	+
12	for (oc = cb->open_caps; oc != NULL; oc = oc->next)
13	{
14	- *code++ = OP_CLOSE;
15	- PUT2INC(code, 0, oc->number);
16	+ if (lengthptr != NULL)
17	+ {
18	+ *lengthptr += CU2BYTES(1) + IMM2_SIZE;
19	+ }
20	+ else
21	+ {
22	+ *code++ = OP_CLOSE;
23	+ PUT2INC(code, 0, oc->number);
24	+ }
25	}
26	setverb = *code++ =
27	(cb->assert_depth > 0)? OP_ASSERT_ACCEPT : OP_ACCEPT;

Lines 6-24 Link Here

(-)pkg-plist (-6 / +19 lines)
6	lib/libpcre2-16.a	6	lib/libpcre2-16.a
7	lib/libpcre2-16.so	7	lib/libpcre2-16.so
8	lib/libpcre2-16.so.0	8	lib/libpcre2-16.so.0
9	lib/libpcre2-16.so.0.3.0	9	lib/libpcre2-16.so.0.7.0
10	lib/libpcre2-32.a	10	lib/libpcre2-32.a
11	lib/libpcre2-32.so	11	lib/libpcre2-32.so
12	lib/libpcre2-32.so.0	12	lib/libpcre2-32.so.0
13	lib/libpcre2-32.so.0.3.0	13	lib/libpcre2-32.so.0.7.0
14	lib/libpcre2-8.a	14	lib/libpcre2-8.a
15	lib/libpcre2-8.so	15	lib/libpcre2-8.so
16	lib/libpcre2-8.so.0	16	lib/libpcre2-8.so.0
17	lib/libpcre2-8.so.0.3.0	17	lib/libpcre2-8.so.0.7.0
18	lib/libpcre2-posix.a	18	lib/libpcre2-posix.a
19	lib/libpcre2-posix.so	19	lib/libpcre2-posix.so
20	lib/libpcre2-posix.so.0	20	lib/libpcre2-posix.so.2
21	lib/libpcre2-posix.so.0.0.1	21	lib/libpcre2-posix.so.2.0.0
22	libdata/pkgconfig/libpcre2-16.pc	22	libdata/pkgconfig/libpcre2-16.pc
23	libdata/pkgconfig/libpcre2-32.pc	23	libdata/pkgconfig/libpcre2-32.pc
24	libdata/pkgconfig/libpcre2-8.pc	24	libdata/pkgconfig/libpcre2-8.pc
Lines 28-33 Link Here
28	man/man1/pcre2test.1.gz	28	man/man1/pcre2test.1.gz
29	man/man3/pcre2.3.gz	29	man/man3/pcre2.3.gz
30	man/man3/pcre2_callout_enumerate.3.gz	30	man/man3/pcre2_callout_enumerate.3.gz
		31	man/man3/pcre2_code_copy.3.gz
		32	man/man3/pcre2_code_copy_with_tables.3.gz
31	man/man3/pcre2_code_free.3.gz	33	man/man3/pcre2_code_free.3.gz
32	man/man3/pcre2_compile.3.gz	34	man/man3/pcre2_compile.3.gz
33	man/man3/pcre2_compile_context_copy.3.gz	35	man/man3/pcre2_compile_context_copy.3.gz
Lines 34-39 Link Here
34	man/man3/pcre2_compile_context_create.3.gz	36	man/man3/pcre2_compile_context_create.3.gz
35	man/man3/pcre2_compile_context_free.3.gz	37	man/man3/pcre2_compile_context_free.3.gz
36	man/man3/pcre2_config.3.gz	38	man/man3/pcre2_config.3.gz
		39	man/man3/pcre2_convert_context_copy.3.gz
		40	man/man3/pcre2_convert_context_create.3.gz
		41	man/man3/pcre2_convert_context_free.3.gz
		42	man/man3/pcre2_converted_pattern_free.3.gz
37	man/man3/pcre2_dfa_match.3.gz	43	man/man3/pcre2_dfa_match.3.gz
38	man/man3/pcre2_general_context_copy.3.gz	44	man/man3/pcre2_general_context_copy.3.gz
39	man/man3/pcre2_general_context_create.3.gz	45	man/man3/pcre2_general_context_create.3.gz
Lines 57-62 Link Here
57	man/man3/pcre2_match_data_create.3.gz	63	man/man3/pcre2_match_data_create.3.gz
58	man/man3/pcre2_match_data_create_from_pattern.3.gz	64	man/man3/pcre2_match_data_create_from_pattern.3.gz
59	man/man3/pcre2_match_data_free.3.gz	65	man/man3/pcre2_match_data_free.3.gz
		66	man/man3/pcre2_pattern_convert.3.gz
60	man/man3/pcre2_pattern_info.3.gz	67	man/man3/pcre2_pattern_info.3.gz
61	man/man3/pcre2_serialize_decode.3.gz	68	man/man3/pcre2_serialize_decode.3.gz
62	man/man3/pcre2_serialize_encode.3.gz	69	man/man3/pcre2_serialize_encode.3.gz
Lines 65-72 Link Here
65	man/man3/pcre2_set_bsr.3.gz	72	man/man3/pcre2_set_bsr.3.gz
66	man/man3/pcre2_set_callout.3.gz	73	man/man3/pcre2_set_callout.3.gz
67	man/man3/pcre2_set_character_tables.3.gz	74	man/man3/pcre2_set_character_tables.3.gz
		75	man/man3/pcre2_set_compile_extra_options.3.gz
68	man/man3/pcre2_set_compile_recursion_guard.3.gz	76	man/man3/pcre2_set_compile_recursion_guard.3.gz
		77	man/man3/pcre2_set_depth_limit.3.gz
		78	man/man3/pcre2_set_glob_escape.3.gz
		79	man/man3/pcre2_set_glob_separator.3.gz
		80	man/man3/pcre2_set_heap_limit.3.gz
69	man/man3/pcre2_set_match_limit.3.gz	81	man/man3/pcre2_set_match_limit.3.gz
		82	man/man3/pcre2_set_max_pattern_length.3.gz
70	man/man3/pcre2_set_newline.3.gz	83	man/man3/pcre2_set_newline.3.gz
71	man/man3/pcre2_set_offset_limit.3.gz	84	man/man3/pcre2_set_offset_limit.3.gz
72	man/man3/pcre2_set_parens_nest_limit.3.gz	85	man/man3/pcre2_set_parens_nest_limit.3.gz
Lines 88-93 Link Here
88	man/man3/pcre2build.3.gz	101	man/man3/pcre2build.3.gz
89	man/man3/pcre2callout.3.gz	102	man/man3/pcre2callout.3.gz
90	man/man3/pcre2compat.3.gz	103	man/man3/pcre2compat.3.gz
		104	man/man3/pcre2convert.3.gz
91	man/man3/pcre2demo.3.gz	105	man/man3/pcre2demo.3.gz
92	man/man3/pcre2jit.3.gz	106	man/man3/pcre2jit.3.gz
93	man/man3/pcre2limits.3.gz	107	man/man3/pcre2limits.3.gz
Lines 98-103 Link Here
98	man/man3/pcre2posix.3.gz	112	man/man3/pcre2posix.3.gz
99	man/man3/pcre2sample.3.gz	113	man/man3/pcre2sample.3.gz
100	man/man3/pcre2serialize.3.gz	114	man/man3/pcre2serialize.3.gz
101	man/man3/pcre2stack.3.gz
102	man/man3/pcre2syntax.3.gz	115	man/man3/pcre2syntax.3.gz
103	man/man3/pcre2unicode.3.gz	116	man/man3/pcre2unicode.3.gz