diff options
| author | Alasdair Kergon <agk@redhat.com> | 2010-11-02 19:56:33 +0000 |
|---|---|---|
| committer | Alasdair Kergon <agk@redhat.com> | 2010-11-02 19:56:33 +0000 |
| commit | 4b429b6c334e7d849031276f1b3f74b5d48aac1d (patch) | |
| tree | 29afda905f9edf7ced8a25e8a0ca067a6d05927d /libdm/regex | |
| parent | 2955b913ea0c34e12723537abc9af9cc8d14c3b3 (diff) | |
| download | lvm2-4b429b6c334e7d849031276f1b3f74b5d48aac1d.tar.gz | |
Fix regex optimiser not to ignore RHS of OR nodes in _find_leftmost_common.
Diffstat (limited to 'libdm/regex')
| -rw-r--r-- | libdm/regex/parse_rx.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/libdm/regex/parse_rx.c b/libdm/regex/parse_rx.c index 9f3e1647b..332f16dd1 100644 --- a/libdm/regex/parse_rx.c +++ b/libdm/regex/parse_rx.c @@ -473,16 +473,19 @@ static int _find_leftmost_common(struct rx_node *or, unsigned left_depth = _depth(left, leftmost); unsigned right_depth = _depth(right, leftmost); - while (left_depth > right_depth) { + while (left_depth > right_depth && left->type != OR) { left = LEFT(left); left_depth--; } - while (right_depth > left_depth) { + while (right_depth > left_depth && right->type != OR) { right = LEFT(right); right_depth--; } + if (left_depth != right_depth) + return 0; + while (left_depth) { if (left->type == CAT && right->type == CAT) { if (_nodes_equal(LEFT(left), LEFT(right))) { @@ -491,6 +494,8 @@ static int _find_leftmost_common(struct rx_node *or, return 1; } } + if (left->type == OR || right->type == OR) + break; left = LEFT(left); right = LEFT(right); left_depth--; @@ -568,7 +573,6 @@ static struct rx_node *_pass(struct dm_pool *mem, case QUEST: if (!(r->left = _pass(mem, r->left, changed))) return_NULL; - break; case OR: /* It's important we optimise sub nodes first */ @@ -577,7 +581,6 @@ static struct rx_node *_pass(struct dm_pool *mem, if (!(r->right = _pass(mem, r->right, changed))) return_NULL; - /* * If rotate_ors changes the tree, left and right are stale, * so just set 'changed' to repeat the search. |