diff options
| author | JinWang An <jinwang.an@samsung.com> | 2021-03-09 14:53:57 +0900 |
|---|---|---|
| committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2021-03-17 16:38:05 +0900 |
| commit | cd11978be965bd754e9c5fb2875238ee2b6fb896 (patch) | |
| tree | 938413b835ce4bc7353170053ea636ea64f82218 /lib/regcomp.c | |
| parent | c24e431bf6532f6a0997a6a0ab6955fa61170978 (diff) | |
| download | tar-cd11978be965bd754e9c5fb2875238ee2b6fb896.tar.gz tar-cd11978be965bd754e9c5fb2875238ee2b6fb896.tar.bz2 tar-cd11978be965bd754e9c5fb2875238ee2b6fb896.zip | |
[CVE-2009-5155] Diagnose ERE '()|\1'tizen_7.0_m2_releasetizen_6.5.m2_releasesubmit/tizen_base/20210317.073914submit/tizen_7.0_base_hotfix/20221115.161701submit/tizen_7.0_base/20221028.201301submit/tizen_6.5_base/20211027.201201submit/tizen_6.5_base/20211027.183102submit/tizen_6.5_base/20211026.180902accepted/tizen/base/tool/20210321.225331accepted/tizen/7.0/base/tool/hotfix/20221115.084825accepted/tizen/7.0/base/tool/20221028.120752accepted/tizen/7.0/base/hotfix/20230714.004025accepted/tizen/7.0/base/20230714.003216accepted/tizen/6.5/base/tool/20211027.121842accepted/tizen/6.5/base/tool/20211027.105707accepted/tizen/6.5/base/20230714.002808tizen_7.0_base_hotfixtizen_7.0_basetizen_6.5_baseaccepted/tizen_7.0_base_tool_hotfixaccepted/tizen_7.0_base_toolaccepted/tizen_7.0_base_hotfixaccepted/tizen_7.0_baseaccepted/tizen_6.5_base_toolaccepted/tizen_6.5_base
Problem reported by Hanno Böck in: http://bugs.gnu.org/21513
* lib/regcomp.c (parse_reg_exp): While parsing alternatives, keep
track of the set of previously-completed subexpressions available
before the first alternative, and restore this set just before
parsing each subsequent alternative. This lets us diagnose the
invalid back-reference in the ERE '()|\1'.
Change-Id: I18a2ec367b04a69d8429e92a1b4784b6d7692832
Signed-off-by: JinWang An <jinwang.an@samsung.com>
Diffstat (limited to 'lib/regcomp.c')
| -rw-r--r-- | lib/regcomp.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/regcomp.c b/lib/regcomp.c index fe4d243..022abb5 100644 --- a/lib/regcomp.c +++ b/lib/regcomp.c @@ -2116,6 +2116,7 @@ parse_reg_exp (re_string_t *regexp, regex_t *preg, re_token_t *token, { re_dfa_t *dfa = (re_dfa_t *) preg->buffer; bin_tree_t *tree, *branch = NULL; + bitset_word_t initial_bkref_map = dfa->completed_bkref_map; tree = parse_branch (regexp, preg, token, syntax, nest, err); if (BE (*err != REG_NOERROR && tree == NULL, 0)) return NULL; @@ -2126,9 +2127,16 @@ parse_reg_exp (re_string_t *regexp, regex_t *preg, re_token_t *token, if (token->type != OP_ALT && token->type != END_OF_RE && (nest == 0 || token->type != OP_CLOSE_SUBEXP)) { + bitset_word_t accumulated_bkref_map = dfa->completed_bkref_map; + dfa->completed_bkref_map = initial_bkref_map; branch = parse_branch (regexp, preg, token, syntax, nest, err); if (BE (*err != REG_NOERROR && branch == NULL, 0)) - return NULL; + { + if (tree != NULL) + postorder (tree, free_tree, NULL); + return NULL; + } + dfa->completed_bkref_map |= accumulated_bkref_map; } else branch = NULL; |