1 files changed, 6 insertions, 9 deletions

diff --git a/src/regex.c b/src/regex.c
index 7e70c494f47..8aa54331fc7 100644
--- a/src/regex.c
+++ b/src/regex.c
@@ -1320,23 +1320,20 @@ typedef struct
 #define FAIL_STACK_GROWTH_FACTOR 4
 
 #define GROW_FAIL_STACK(fail_stack)                                     \
-  (((fail_stack).size * sizeof (fail_stack_elt_t)                       \
-    >= re_max_failures * TYPICAL_FAILURE_SIZE)                          \
+  (((fail_stack).size >= re_max_failures * TYPICAL_FAILURE_SIZE)        \
    ? 0                                                                  \
    : ((fail_stack).stack                                                \
       = REGEX_REALLOCATE_STACK ((fail_stack).stack,                     \
           (fail_stack).size * sizeof (fail_stack_elt_t),                \
-          min (re_max_failures * TYPICAL_FAILURE_SIZE,                  \
-               ((fail_stack).size * sizeof (fail_stack_elt_t)           \
-                * FAIL_STACK_GROWTH_FACTOR))),                          \
+          min (re_max_failures * TYPICAL_FAILURE_SIZE,                  \
+               ((fail_stack).size * FAIL_STACK_GROWTH_FACTOR))          \
+          * sizeof (fail_stack_elt_t)),                                 \
                                                                         \
       (fail_stack).stack == NULL                                        \
       ? 0                                                               \
       : ((fail_stack).size                                              \
-         = (min (re_max_failures * TYPICAL_FAILURE_SIZE,                \
-                 ((fail_stack).size * sizeof (fail_stack_elt_t)         \
-                  * FAIL_STACK_GROWTH_FACTOR))                          \
-            / sizeof (fail_stack_elt_t)),                               \
+         = (min (re_max_failures * TYPICAL_FAILURE_SIZE,                \
+                 ((fail_stack).size * FAIL_STACK_GROWTH_FACTOR))),      \
          1)))