diff options
| author | Paul Eggert | 2022-04-08 17:02:21 -0700 |
|---|---|---|
| committer | Paul Eggert | 2022-04-08 17:33:16 -0700 |
| commit | 0b16e4e1f1b9e6de16aa613b1b363d76b1023766 (patch) | |
| tree | 74fd7a86a1413b54f624f75254de63abf220fa90 /lib/regexec.c | |
| parent | 68bc1446855c86b96d5bc22f819e63358ab250ac (diff) | |
| download | emacs-0b16e4e1f1b9e6de16aa613b1b363d76b1023766.tar.gz emacs-0b16e4e1f1b9e6de16aa613b1b363d76b1023766.zip | |
Update from Gnulib by running admin/merge-gnulib
Diffstat (limited to 'lib/regexec.c')
| -rw-r--r-- | lib/regexec.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/regexec.c b/lib/regexec.c index aea1e7da52c..521cb028415 100644 --- a/lib/regexec.c +++ b/lib/regexec.c | |||
| @@ -1308,8 +1308,8 @@ push_fail_stack (struct re_fail_stack_t *fs, Idx str_idx, Idx dest_node, | |||
| 1308 | re_node_set *eps_via_nodes) | 1308 | re_node_set *eps_via_nodes) |
| 1309 | { | 1309 | { |
| 1310 | reg_errcode_t err; | 1310 | reg_errcode_t err; |
| 1311 | Idx num = fs->num++; | 1311 | Idx num = fs->num; |
| 1312 | if (fs->num == fs->alloc) | 1312 | if (num == fs->alloc) |
| 1313 | { | 1313 | { |
| 1314 | struct re_fail_stack_ent_t *new_array; | 1314 | struct re_fail_stack_ent_t *new_array; |
| 1315 | new_array = re_realloc (fs->stack, struct re_fail_stack_ent_t, | 1315 | new_array = re_realloc (fs->stack, struct re_fail_stack_ent_t, |
| @@ -1324,6 +1324,7 @@ push_fail_stack (struct re_fail_stack_t *fs, Idx str_idx, Idx dest_node, | |||
| 1324 | fs->stack[num].regs = re_malloc (regmatch_t, 2 * nregs); | 1324 | fs->stack[num].regs = re_malloc (regmatch_t, 2 * nregs); |
| 1325 | if (fs->stack[num].regs == NULL) | 1325 | if (fs->stack[num].regs == NULL) |
| 1326 | return REG_ESPACE; | 1326 | return REG_ESPACE; |
| 1327 | fs->num = num + 1; | ||
| 1327 | memcpy (fs->stack[num].regs, regs, sizeof (regmatch_t) * nregs); | 1328 | memcpy (fs->stack[num].regs, regs, sizeof (regmatch_t) * nregs); |
| 1328 | memcpy (fs->stack[num].regs + nregs, prevregs, sizeof (regmatch_t) * nregs); | 1329 | memcpy (fs->stack[num].regs + nregs, prevregs, sizeof (regmatch_t) * nregs); |
| 1329 | err = re_node_set_init_copy (&fs->stack[num].eps_via_nodes, eps_via_nodes); | 1330 | err = re_node_set_init_copy (&fs->stack[num].eps_via_nodes, eps_via_nodes); |