diff options
| author | Erlang/OTP <[email protected]> | 2010-04-15 04:37:55 +0000 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2010-04-15 04:37:55 +0000 |
| commit | ab47252a5f7d540d4119d38dffe69acca86d2a41 (patch) | |
| tree | 9817bba0553bcd409c36fb330f7408ec7ca2369c /lib/stdlib | |
| parent | 4e315422de9bb1b5c8d6668cbccf8fe1084f536c (diff) | |
| parent | f43718785523cb4635d1c22a78a7620ed5e86609 (diff) | |
| download | otp-ab47252a5f7d540d4119d38dffe69acca86d2a41.tar.gz otp-ab47252a5f7d540d4119d38dffe69acca86d2a41.tar.bz2 otp-ab47252a5f7d540d4119d38dffe69acca86d2a41.zip | |
Merge branch 'ms/pcre-compile-workspace-overrun' into dev
* ms/pcre-compile-workspace-overrun:
re_SUITE: Add pcre_compile_workspace_overflow/1
MacOS X: Boost default stack size
Fix check for compile workspace overflow
OTP-8539 ms/pcre-compile-workspace-overrun
Diffstat (limited to 'lib/stdlib')
| -rw-r--r-- | lib/stdlib/test/re_SUITE.erl | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/lib/stdlib/test/re_SUITE.erl b/lib/stdlib/test/re_SUITE.erl index 02683f9f1a..4e78568a87 100644 --- a/lib/stdlib/test/re_SUITE.erl +++ b/lib/stdlib/test/re_SUITE.erl @@ -18,12 +18,12 @@ %% -module(re_SUITE). --export([all/1, pcre/1,compile_options/1,run_options/1,combined_options/1,replace_autogen/1,global_capture/1,replace_input_types/1,replace_return/1,split_autogen/1,split_options/1,split_specials/1,error_handling/1,pcre_cve_2008_2371/1]). +-export([all/1, pcre/1,compile_options/1,run_options/1,combined_options/1,replace_autogen/1,global_capture/1,replace_input_types/1,replace_return/1,split_autogen/1,split_options/1,split_specials/1,error_handling/1,pcre_cve_2008_2371/1,pcre_compile_workspace_overflow/1]). -include("test_server.hrl"). -include_lib("kernel/include/file.hrl"). -all(suite) -> [pcre,compile_options,run_options,combined_options,replace_autogen,global_capture,replace_input_types,replace_return,split_autogen,split_options,split_specials,error_handling,pcre_cve_2008_2371]. +all(suite) -> [pcre,compile_options,run_options,combined_options,replace_autogen,global_capture,replace_input_types,replace_return,split_autogen,split_options,split_specials,error_handling,pcre_cve_2008_2371,pcre_compile_workspace_overflow]. pcre(doc) -> ["Run all applicable tests from the PCRE testsuites."]; @@ -544,3 +544,11 @@ pcre_cve_2008_2371(Config) when is_list(Config) -> %% Make sure it doesn't crash the emulator. re:compile(<<"(?i)[\xc3\xa9\xc3\xbd]|[\xc3\xa9\xc3\xbdA]">>, [unicode]), ok. + +pcre_compile_workspace_overflow(doc) -> + "Patch from http://vcs.pcre.org/viewvc/code/trunk/pcre_compile.c?r1=504&r2=505&view=patch"; +pcre_compile_workspace_overflow(Config) when is_list(Config) -> + N = 819, + ?line {error,{"internal error: overran compiling workspace",799}} = + re:compile([lists:duplicate(N, $(), lists:duplicate(N, $))]), + ok. |