upstream commit

Switch to recallocarray() for a few operations.  Both
growth and shrinkage are handled safely, and there also is no need for
preallocation dances. Future changes in this area will be less error prone.
Review and one bug found by markus

Upstream-ID: 822d664d6a5a1d10eccb23acdd53578a679d5065

1 files changed, 2 insertions, 2 deletions

diff --git a/hostfile.c b/hostfile.c
index 1804cff99..12f174ff9 100644
--- a/hostfile.c
+++ b/hostfile.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hostfile.c,v 1.70 2017/04/30 23:18:44 djm Exp $ */
+/* $OpenBSD: hostfile.c,v 1.71 2017/05/31 09:15:42 deraadt Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -251,7 +251,7 @@ record_hostkey(struct hostkey_foreach_line *l, void *_ctx)
             l->marker == MRK_NONE ? "" :
             (l->marker == MRK_CA ? "ca " : "revoked "),
             sshkey_type(l->key), l->path, l->linenum);
-        if ((tmp = reallocarray(hostkeys->entries,
+        if ((tmp = recallocarray(hostkeys->entries, hostkeys->num_entries,
             hostkeys->num_entries + 1, sizeof(*hostkeys->entries))) == NULL)
                 return SSH_ERR_ALLOC_FAIL;
         hostkeys->entries = tmp;