Skip to content

[WIP] bpo-35859: Worst case #12290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ghost wants to merge 22 commits into from
Closed

[WIP] bpo-35859: Worst case #12290

Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
c556d5a
1. add asserts
wjssz Mar 8, 2019
3c294e4
2. macro MARK_PUSH() bug
wjssz Mar 8, 2019
529485e
3. add a new field in_repeat to match_context
wjssz Mar 8, 2019
ad74049
4. use ctx->in_repeat in SRE_OP_BRANCH
wjssz Mar 11, 2019
01d9b8c
5. JUMP_MIN_UNTIL_2 should MARK_PUSH() if in a repeat
wjssz Mar 8, 2019
0db231e
6. JUMP_REPEAT_ONE_[12] should MARK_PUSH() if in a repeat
wjssz Mar 9, 2019
0e51eb6
7. JUMP_MIN_REPEAT_ONE should MARK_PUSH() if in a repeat
wjssz Mar 9, 2019
2bd2eb4
8. JUMP_ASSERT_NOT should LASTMARK_SAVE()
wjssz Mar 10, 2019
6a02d5b
9. JUMP_ASSERT_NOT should MARK_PUSH() if in a repeat
wjssz Mar 10, 2019
edb6d74
10. polish match_context struct
wjssz Mar 9, 2019
c703a72
11. limit max group to 1,073,741,823
wjssz Mar 10, 2019
2d3fdba
12. raise RuntimeError if the span of capture group is wrong
wjssz Mar 11, 2019
ed06d52
13. clean error process code
wjssz Mar 11, 2019
6c41e2e
14. add blurb
wjssz Mar 11, 2019
5156b0e
15. JUMP_MIN_UNTIL_3 uses MARK_PUSH() protect
wjssz Mar 11, 2019
494c008
SRE_OP_MAX_UNTIL
wjssz Mar 11, 2019
da40913
SRE_OP_MIN_UNTIL
wjssz Mar 11, 2019
9a04391
SRE_OP_REPEAT_ONE
wjssz Mar 11, 2019
54402bc
SRE_OP_MIN_REPEAT_ONE
wjssz Mar 11, 2019
8f2fe8a
SRE_OP_BRANCH
wjssz Mar 11, 2019
8e184f5
SRE_OP_ASSERT
wjssz Mar 11, 2019
3c31ecc
SRE_OP_ASSERT_NOT
wjssz Mar 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
SRE_OP_ASSERT_NOT
  • Loading branch information
@wjssz
wjssz committed Mar 12, 2019
commit 3c31ecc95277383160c03d5c671c1a670dc1b2d8
9 changes: 3 additions & 6 deletions Modules/sre_lib.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1327,18 +1327,15 @@ SRE(match)(SRE_STATE* state, SRE_CODE* pattern, int toplevel)
if (ctx->ptr - (SRE_CHAR *)state->beginning >= (Py_ssize_t)ctx->pattern[1]) {
state->ptr = ctx->ptr - ctx->pattern[1];
LASTMARK_SAVE();
if (state->repeat)
MARK_PUSH(ctx->lastmark);
MARK_PUSH(ctx->lastmark);

DO_JUMP0(JUMP_ASSERT_NOT, jump_assert_not, ctx->pattern+2);
if (ret) {
if (state->repeat)
MARK_POP_DISCARD(ctx->lastmark);
MARK_POP_DISCARD(ctx->lastmark);
RETURN_ON_ERROR(ret);
RETURN_FAILURE;
}
if (state->repeat)
MARK_POP(ctx->lastmark);
MARK_POP(ctx->lastmark);
LASTMARK_RESTORE();
}
ctx->pattern += ctx->pattern[0];
Expand Down