]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
upstream: calloc can return NULL but xcalloc can't.
authordtucker@openbsd.org <dtucker@openbsd.org>
Sun, 12 Mar 2023 09:41:18 +0000 (09:41 +0000)
committerDarren Tucker <dtucker@dtucker.net>
Sun, 12 Mar 2023 11:01:57 +0000 (22:01 +1100)
From Coverity CID 291881, ok djm@

OpenBSD-Commit-ID: 50204b755f66b2ec7ac3cfe379d07d85ca161d2b

sftp.c

diff --git a/sftp.c b/sftp.c
index 4a3774421163c8bbf3acb8fa2f93f5419978a5af..29081db3d434dd0333ccf97342404d3fff09d572 100644 (file)
--- a/sftp.c
+++ b/sftp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp.c,v 1.228 2023/03/08 06:21:32 dtucker Exp $ */
+/* $OpenBSD: sftp.c,v 1.229 2023/03/12 09:41:18 dtucker Exp $ */
 /*
  * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
  *
@@ -1007,7 +1007,7 @@ do_globbed_ls(struct sftp_conn *conn, const char *path,
         */
        for (nentries = 0; g.gl_pathv[nentries] != NULL; nentries++)
                ;       /* count entries */
-       indices = calloc(nentries, sizeof(*indices));
+       indices = xcalloc(nentries, sizeof(*indices));
        for (i = 0; i < nentries; i++)
                indices[i] = i;