From: dtucker@openbsd.org <dtucker@openbsd.org>
Date: Sun, 12 Mar 2023 09:41:18 +0000 (+0000)
Subject: upstream: calloc can return NULL but xcalloc can't.
X-Git-Tag: V_9_3_P1~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f287ba60d342b3e2f750e7332d2131e3ec7ecd0;p=thirdparty%2Fopenssh-portable.git

upstream: calloc can return NULL but xcalloc can't.

From Coverity CID 291881, ok djm@

OpenBSD-Commit-ID: 50204b755f66b2ec7ac3cfe379d07d85ca161d2b
---

diff --git a/sftp.c b/sftp.c
index 4a3774421..29081db3d 100644
--- 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;