diff options
Diffstat (limited to 'gl/regex_internal.c')
| -rw-r--r-- | gl/regex_internal.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/gl/regex_internal.c b/gl/regex_internal.c index 8cd096eb..9b89cc93 100644 --- a/gl/regex_internal.c +++ b/gl/regex_internal.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* Extended regular expression matching and search library. | 1 | /* Extended regular expression matching and search library. |
| 2 | Copyright (C) 2002-2024 Free Software Foundation, Inc. | 2 | Copyright (C) 2002-2025 Free Software Foundation, Inc. |
| 3 | This file is part of the GNU C Library. | 3 | This file is part of the GNU C Library. |
| 4 | Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>. | 4 | Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>. |
| 5 | 5 | ||
| @@ -937,8 +937,7 @@ re_node_set_alloc (re_node_set *set, Idx size) | |||
| 937 | set->alloc = size; | 937 | set->alloc = size; |
| 938 | set->nelem = 0; | 938 | set->nelem = 0; |
| 939 | set->elems = re_malloc (Idx, size); | 939 | set->elems = re_malloc (Idx, size); |
| 940 | if (__glibc_unlikely (set->elems == NULL) | 940 | if (__glibc_unlikely (set->elems == NULL)) |
| 941 | && (MALLOC_0_IS_NONNULL || size != 0)) | ||
| 942 | return REG_ESPACE; | 941 | return REG_ESPACE; |
| 943 | return REG_NOERROR; | 942 | return REG_NOERROR; |
| 944 | } | 943 | } |
| @@ -1596,7 +1595,7 @@ create_ci_newstate (const re_dfa_t *dfa, const re_node_set *nodes, | |||
| 1596 | reg_errcode_t err; | 1595 | reg_errcode_t err; |
| 1597 | re_dfastate_t *newstate; | 1596 | re_dfastate_t *newstate; |
| 1598 | 1597 | ||
| 1599 | newstate = (re_dfastate_t *) calloc (sizeof (re_dfastate_t), 1); | 1598 | newstate = (re_dfastate_t *) calloc (1, sizeof (re_dfastate_t)); |
| 1600 | if (__glibc_unlikely (newstate == NULL)) | 1599 | if (__glibc_unlikely (newstate == NULL)) |
| 1601 | return NULL; | 1600 | return NULL; |
| 1602 | err = re_node_set_init_copy (&newstate->nodes, nodes); | 1601 | err = re_node_set_init_copy (&newstate->nodes, nodes); |
| @@ -1644,7 +1643,7 @@ create_cd_newstate (const re_dfa_t *dfa, const re_node_set *nodes, | |||
| 1644 | reg_errcode_t err; | 1643 | reg_errcode_t err; |
| 1645 | re_dfastate_t *newstate; | 1644 | re_dfastate_t *newstate; |
| 1646 | 1645 | ||
| 1647 | newstate = (re_dfastate_t *) calloc (sizeof (re_dfastate_t), 1); | 1646 | newstate = (re_dfastate_t *) calloc (1, sizeof (re_dfastate_t)); |
| 1648 | if (__glibc_unlikely (newstate == NULL)) | 1647 | if (__glibc_unlikely (newstate == NULL)) |
| 1649 | return NULL; | 1648 | return NULL; |
| 1650 | err = re_node_set_init_copy (&newstate->nodes, nodes); | 1649 | err = re_node_set_init_copy (&newstate->nodes, nodes); |
