diff options
Diffstat (limited to 'sys-apps/sed/files/sed-4.3-dfa-segv-3.patch')
| -rw-r--r-- | sys-apps/sed/files/sed-4.3-dfa-segv-3.patch | 146 |
1 files changed, 146 insertions, 0 deletions
diff --git a/sys-apps/sed/files/sed-4.3-dfa-segv-3.patch b/sys-apps/sed/files/sed-4.3-dfa-segv-3.patch new file mode 100644 index 000000000000..d85022f754f0 --- /dev/null +++ b/sys-apps/sed/files/sed-4.3-dfa-segv-3.patch @@ -0,0 +1,146 @@ +fix from upstream gnulib (fudged to apply to sed-4.3) + +From 7c345c68cdf62737ccc4a9d0ba2cd921fae850fa Mon Sep 17 00:00:00 2001 +From: Norihiro Tanaka <noritnk@kcn.ne.jp> +Date: Mon, 9 Jan 2017 08:21:21 +0900 +Subject: [PATCH] dfa: melt down dfastate into build_state + +* src/dfa.c (dfastate): Remove it. +(build_state): Insert content of dfastate() to bottom. +--- + lib/dfa.c | 97 +++++++++++++++++++++++++++++---------------------------------- + 1 file changed, 45 insertions(+), 52 deletions(-) + +diff --git a/lib/dfa.c b/lib/dfa.c +index bda4602b1094..6896ed320a7b 100644 +--- a/lib/dfa.c ++++ b/lib/dfa.c +@@ -2609,8 +2609,10 @@ realloc_trans_if_necessary (struct dfa *d) + } + } + +-/* Return the transition out of state s of d for the input character uc, +- updating the slots in trans accordingly. ++/* ++ Calculate the transition table for a new state derived from state s ++ for a compiled dfa d after input character uc, and return the new ++ state number. + + Do not worry about all possible input characters; calculate just the group + of positions that match uc. Label it with the set of characters that +@@ -2639,8 +2641,9 @@ realloc_trans_if_necessary (struct dfa *d) + If after comparing with every group there are characters remaining in C, + create a new group labeled with the characters of C and insert this + position in that group. */ ++ + static state_num +-dfastate (state_num s, struct dfa *d, unsigned char uc, state_num trans[]) ++build_state (state_num s, struct dfa *d, unsigned char uc) + { + leaf_set group; /* Positions that match the input char. */ + charclass label; /* The group's label. */ +@@ -2652,6 +2655,45 @@ dfastate (state_num s, struct dfa *d, unsigned char uc, state_num trans[]) + fprintf (stderr, "build state %td\n", s); + #endif + ++ /* A pointer to the new transition table, and the table itself. */ ++ state_num **ptrans = (ACCEPTING (s, *d) ? d->fails : d->trans) + s; ++ state_num *trans = *ptrans; ++ ++ if (!trans) ++ { ++ /* MAX_TRCOUNT is an arbitrary upper limit on the number of ++ transition tables that can exist at once, other than for ++ initial states. Often-used transition tables are quickly ++ rebuilt, whereas rarely-used ones are cleared away. */ ++ if (MAX_TRCOUNT <= d->trcount) ++ { ++ for (state_num i = d->min_trcount; i < d->tralloc; i++) ++ { ++ free (d->trans[i]); ++ free (d->fails[i]); ++ d->trans[i] = d->fails[i] = NULL; ++ } ++ d->trcount = 0; ++ } ++ ++ d->trcount++; ++ *ptrans = trans = xmalloc (NOTCHAR * sizeof *trans); ++ ++ /* Fill transition table with a default value which means that the ++ transited state has not been calculated yet. */ ++ for (int i = 0; i < NOTCHAR; i++) ++ trans[i] = -2; ++ } ++ ++ /* Set up the success bits for this state. */ ++ d->success[s] = 0; ++ if (ACCEPTS_IN_CONTEXT (d->states[s].context, CTX_NEWLINE, s, *d)) ++ d->success[s] |= CTX_NEWLINE; ++ if (ACCEPTS_IN_CONTEXT (d->states[s].context, CTX_LETTER, s, *d)) ++ d->success[s] |= CTX_LETTER; ++ if (ACCEPTS_IN_CONTEXT (d->states[s].context, CTX_NONE, s, *d)) ++ d->success[s] |= CTX_NONE; ++ + group.elems = xnmalloc (d->nleaves, sizeof *group.elems); + group.nelem = 0; + +@@ -2889,55 +2931,6 @@ dfastate (state_num s, struct dfa *d, unsigned char uc, state_num trans[]) + return trans[uc]; + } + +-/* Calculate the transition table for a new state derived from state s +- for a compiled dfa d after input character uc, and return the new +- state number. */ +- +-static state_num +-build_state (state_num s, struct dfa *d, unsigned char uc) +-{ +- /* A pointer to the new transition table, and the table itself. */ +- state_num **ptrans = (ACCEPTING (s, *d) ? d->fails : d->trans) + s; +- state_num *trans = *ptrans; +- +- if (!trans) +- { +- /* MAX_TRCOUNT is an arbitrary upper limit on the number of +- transition tables that can exist at once, other than for +- initial states. Often-used transition tables are quickly +- rebuilt, whereas rarely-used ones are cleared away. */ +- if (MAX_TRCOUNT <= d->trcount) +- { +- for (state_num i = d->min_trcount; i < d->tralloc; i++) +- { +- free (d->trans[i]); +- free (d->fails[i]); +- d->trans[i] = d->fails[i] = NULL; +- } +- d->trcount = 0; +- } +- +- d->trcount++; +- *ptrans = trans = xmalloc (NOTCHAR * sizeof *trans); +- +- /* Fill transition table with a default value which means that the +- transited state has not been calculated yet. */ +- for (int i = 0; i < NOTCHAR; i++) +- trans[i] = -2; +- } +- +- /* Set up the success bits for this state. */ +- d->success[s] = 0; +- if (ACCEPTS_IN_CONTEXT (d->states[s].context, CTX_NEWLINE, s, *d)) +- d->success[s] |= CTX_NEWLINE; +- if (ACCEPTS_IN_CONTEXT (d->states[s].context, CTX_LETTER, s, *d)) +- d->success[s] |= CTX_LETTER; +- if (ACCEPTS_IN_CONTEXT (d->states[s].context, CTX_NONE, s, *d)) +- d->success[s] |= CTX_NONE; +- +- return dfastate (s, d, uc, trans); +-} +- + /* Multibyte character handling sub-routines for dfaexec. */ + + /* Consume a single byte and transit state from 's' to '*next_state'. +-- +2.11.0 + |