Merge branch 'nd/clear-gitenv-upon-use-of-alias'

diff --git a/xdiff-interface.c b/xdiff-interface.c
index cb67c1c42b35e412dccf9a13ad18dde727ab8ce6..54236f24b9786710f91650ac63f6004cdeb012e6 100644 (file)
--- a/xdiff-interface.c
+++ b/xdiff-interface.c
@@ -265,7 +265,7 @@ void xdiff_set_find_func(xdemitconf_t *xecfg, const char *value, int cflags)
        for (i = 0, regs->nr = 1; value[i]; i++)
                if (value[i] == '\n')
                        regs->nr++;
-       regs->array = xmalloc(regs->nr * sizeof(struct ff_reg));
+       ALLOC_ARRAY(regs->array, regs->nr);
        for (i = 0; i < regs->nr; i++) {
                struct ff_reg *reg = regs->array + i;
                const char *ep = strchr(value, '\n'), *expression;