From 417a2577aecdd2b64f8414862376c3f7a953ce6f Mon Sep 17 00:00:00 2001 From: rhuanjl Date: Sat, 22 Oct 2022 11:38:50 +0100 Subject: [PATCH] Fix CharTrie::CloneFrom --- lib/Parser/CharTrie.cpp | 6 ++-- lib/Parser/CharTrie.h | 3 +- lib/Parser/RegexCompileTime.cpp | 3 +- test/Regex/regexCharTrieStack.js | 54 ++++++++++++++++++++++++++++++++ test/Regex/rlexe.xml | 5 +++ 5 files changed, 67 insertions(+), 4 deletions(-) create mode 100644 test/Regex/regexCharTrieStack.js diff --git a/lib/Parser/CharTrie.cpp b/lib/Parser/CharTrie.cpp index 10dc686ee3e..7bffca32bca 100644 --- a/lib/Parser/CharTrie.cpp +++ b/lib/Parser/CharTrie.cpp @@ -1,5 +1,6 @@ //------------------------------------------------------------------------------------------------------- // Copyright (C) Microsoft. All rights reserved. +// Copyright (c) ChakraCore Project Contributors. All rights reserved. // Licensed under the MIT license. See LICENSE.txt file in the project root for full license information. //------------------------------------------------------------------------------------------------------- #include "ParserPch.h" @@ -199,8 +200,9 @@ namespace UnifiedRegex #endif } - void RuntimeCharTrie::CloneFrom(ArenaAllocator* allocator, const CharTrie& other) + void RuntimeCharTrie::CloneFrom(Js::ScriptContext* scriptContext, ArenaAllocator* allocator, const CharTrie& other) { + PROBE_STACK_NO_DISPOSE(scriptContext, Js::Constants::MinStackRegex); count = other.count; if (count > 0) { @@ -208,7 +210,7 @@ namespace UnifiedRegex for (int i = 0; i < count; i++) { children[i].c = other.children[i].c; - children[i].node.CloneFrom(allocator, other.children[i].node); + children[i].node.CloneFrom(scriptContext, allocator, other.children[i].node); } } else diff --git a/lib/Parser/CharTrie.h b/lib/Parser/CharTrie.h index de1d05fe5cb..6f215868d3d 100644 --- a/lib/Parser/CharTrie.h +++ b/lib/Parser/CharTrie.h @@ -1,5 +1,6 @@ //------------------------------------------------------------------------------------------------------- // Copyright (C) Microsoft. All rights reserved. +// Copyright (c) ChakraCore Project Contributors. All rights reserved. // Licensed under the MIT license. See LICENSE.txt file in the project root for full license information. //------------------------------------------------------------------------------------------------------- #pragma once @@ -65,7 +66,7 @@ namespace UnifiedRegex public: inline RuntimeCharTrie() : count(0), children(0) {} void FreeBody(ArenaAllocator* allocator); - void CloneFrom(ArenaAllocator* allocator, const CharTrie& other); + void CloneFrom(Js::ScriptContext* scriptContext, ArenaAllocator* allocator, const CharTrie& other); bool Match ( const Char* const input diff --git a/lib/Parser/RegexCompileTime.cpp b/lib/Parser/RegexCompileTime.cpp index c9c81de2310..fcbeac2c654 100644 --- a/lib/Parser/RegexCompileTime.cpp +++ b/lib/Parser/RegexCompileTime.cpp @@ -1,5 +1,6 @@ //------------------------------------------------------------------------------------------------------- // Copyright (C) Microsoft. All rights reserved. +// Copyright (c) ChakraCore Project Contributors. All rights reserved. // Licensed under the MIT license. See LICENSE.txt file in the project root for full license information. //------------------------------------------------------------------------------------------------------- #include "ParserPch.h" @@ -2538,7 +2539,7 @@ namespace UnifiedRegex { // Root of trie will live in compile-time allocator, but body will be in run-time allocator runtimeTrie = Anew(compiler.ctAllocator, RuntimeCharTrie); - runtimeTrie->CloneFrom(compiler.rtAllocator, trie); + runtimeTrie->CloneFrom(compiler.scriptContext, compiler.rtAllocator, trie); scheme = Trie; } return; diff --git a/test/Regex/regexCharTrieStack.js b/test/Regex/regexCharTrieStack.js new file mode 100644 index 00000000000..7510835bde1 --- /dev/null +++ b/test/Regex/regexCharTrieStack.js @@ -0,0 +1,54 @@ +//------------------------------------------------------------------------------------------------------- +// Copyright (C) Microsoft. All rights reserved. +// Copyright (c) ChakraCore Project Contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE.txt file in the project root for full license information. +//------------------------------------------------------------------------------------------------------- + +var testString = "tacgattttatcgcgactagttaatcatcatagcaagtaaaatttgaattatgtcattat\ +catgctccattaacaggttatttaattgatactgacgaaattttttcacaatgggttttc\ +tagaatttaatatcagtaattgaagccttcataggggtcctactagtatcctacacgacg\ +caggtccgcagtatcctggagggacgtgttactgattaaaagggtcaaaggaatgaaggc\ +tcacaatgttacctgcttcaccatagtgagccgatgagttttacattagtactaaatccc\ +aaatcatactttacgatgaggcttgctagcgctaaagagaatacatacaccaccacatag\ +aattgttagcgatgatatcaaatagactcctggaagtgtcagggggaaactgttcaatat\ +ttcgtccacaggactgaccaggcatggaaaagactgacgttggaaactataccatctcac\ +gcccgacgcttcactaattgatgatccaaaaaatatagcccggattcctgattagcaaag\ +ggttcacagagaaagatattatcgacgtatatcccaaaaaacagacgtaatgtgcatctt\ +cgaatcgggatgaatacttgtatcataaaaatgtgacctctagtatacaggttaatgtta\ +ctcacccacgtatttggtctaattatgttttatttagtgacaatccaatagataaccggt\ +cctattaagggctatatttttagcgaccacgcgtttaaacaaaggattgtatgtagatgg\ +gcttgatataagatttcggatgtatgggttttataatcgttggagagctcaatcatgagc\ +taatacatggatttcgctacctcaccgagagaccttgcatgaagaattctaaccaaaagt\ +ttaataggccggattggattgagttaattaagaccttgttcagtcatagtaaaaaccctt\n\ +aaattttaccgattgacaaagtgagcagtcgcaataccctatgcgaaacgcctcgatagt\n\ +gactaggtatacaaggtttttgagttcctttgaaatagttaactaatttaaaattaatta\n\ +acgacatggaaatcacagaacctaatgctttgtaggagttatttatgctgtttactgcct\n\ +ctacaaccctaataaagcagtcctaagaatgaaacgcatcttttagttcagaaagtggta\n\ +tccagggtggtcaatttaataaattcaacatcgggtctcaggatattcggtcatataatt\n\ +tattaagggctcttcgagtcttactctgagtgaaattggaaacagtcatccttttcgttg\n\ +tgaggcatcttacaccgctatcgatatacaatgcattccaccgcggtgtcccgtacacaa\n\ +ggaaacttgttaccttggggatataagaaaactcacacgtctcattattaaactgagtac\n\ +tggaacgcacctcggatctgttgcactggattaaaatccgattatttttaaaaatattca\n\ +gtgctagagcatatcaggtctacttttttatctggtatgtaaagcccacggagcgatagt\n\ +gagatccttacgactcaacgaaaagttataacataactcccgttagccaaagcccaatcc\n\ +\n"; +testString = testString + testString + testString; +testString = testString + testString + testString; +testString = testString + testString + testString; +testString = testString + testString + testString; +var seqs = [/a|tttaccct/ig]; + +Array.prototype.push.call(seqs, false, Array.prototype.concat.call(seqs, seqs, testString)); +try { + for (i in seqs) { + testString.match(seqs[i]); + } + print ("Test should produce Stack over flow but didn't, case may need amending") +} +catch(e) { + if (e == "Error: Out of stack space") { + print ("pass") + } else { + print ("Wrong error thrown, expected \"Error: Out of stack space\" but recieved \"" + e + "\""); + } +} diff --git a/test/Regex/rlexe.xml b/test/Regex/rlexe.xml index a4910c524b1..3d531c6bb84 100644 --- a/test/Regex/rlexe.xml +++ b/test/Regex/rlexe.xml @@ -247,4 +247,9 @@ -args summary -endargs + + + regexCharTrieStack.js + +