[openssh-commits] [openssh] 04/10: upstream: consistently use NULL for null pointer constants found
git+noreply at mindrot.org
git+noreply at mindrot.org
Thu Sep 25 17:02:35 AEST 2025
This is an automated email from the git hooks/post-receive script.
djm pushed a commit to branch master
in repository openssh.
commit 6f28a935cc7d073e6647643e81d98b5831df204f
Author: jsg at openbsd.org <jsg at openbsd.org>
AuthorDate: Thu Sep 25 06:23:19 2025 +0000
upstream: consistently use NULL for null pointer constants found
with sparse, ok djm@
OpenBSD-Commit-ID: 1067504b63732d809d0d57ad4bc626818d112772
---
channels.c | 4 ++--
clientloop.c | 4 ++--
scp.c | 8 ++++----
serverloop.c | 4 ++--
sftp.c | 4 ++--
ssh-pkcs11.c | 8 ++++----
sshconnect.c | 4 ++--
sshsig.c | 4 ++--
8 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/channels.c b/channels.c
index aeb0d41d6..ed852beb0 100644
--- a/channels.c
+++ b/channels.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: channels.c,v 1.449 2025/09/15 04:39:58 djm Exp $ */
+/* $OpenBSD: channels.c,v 1.450 2025/09/25 06:23:19 jsg Exp $ */
/*
* Author: Tatu Ylonen <ylo at cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo at cs.hut.fi>, Espoo, Finland
@@ -4565,7 +4565,7 @@ channel_add_permission(struct ssh *ssh, int who, int where,
* host/port_to_connect.
*/
permission_set_add(ssh, who, where,
- local ? host : 0, local ? port : 0,
+ local ? host : NULL, local ? port : 0,
local ? NULL : host, NULL, local ? 0 : port, NULL);
pset->all_permitted = 0;
}
diff --git a/clientloop.c b/clientloop.c
index a2f757867..49d048d85 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clientloop.c,v 1.414 2025/08/18 03:43:01 djm Exp $ */
+/* $OpenBSD: clientloop.c,v 1.415 2025/09/25 06:23:19 jsg Exp $ */
/*
* Author: Tatu Ylonen <ylo at cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo at cs.hut.fi>, Espoo, Finland
@@ -1868,7 +1868,7 @@ client_request_tun_fwd(struct ssh *ssh, int tun_mode,
char *ifname = NULL;
if (tun_mode == SSH_TUNMODE_NO)
- return 0;
+ return NULL;
debug("Requesting tun unit %d in mode %d", local_tun, tun_mode);
diff --git a/scp.c b/scp.c
index c19f57c69..c5f573cc1 100644
--- a/scp.c
+++ b/scp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scp.c,v 1.267 2025/09/24 00:51:28 jsg Exp $ */
+/* $OpenBSD: scp.c,v 1.268 2025/09/25 06:23:19 jsg Exp $ */
/*
* scp - secure remote copy. This is basically patched BSD rcp which
* uses ssh to do the data transfer (instead of using rcmd).
@@ -1572,7 +1572,7 @@ sink_sftp(int argc, char *dst, const char *src, struct sftp_conn *conn)
}
/* Did we actually get any matches back from the glob? */
- if (g.gl_matchc == 0 && g.gl_pathc == 1 && g.gl_pathv[0] != 0) {
+ if (g.gl_matchc == 0 && g.gl_pathc == 1 && g.gl_pathv[0] != NULL) {
/*
* If nothing matched but a path returned, then it's probably
* a GLOB_NOCHECK result. Check whether the unglobbed path
@@ -2013,7 +2013,7 @@ throughlocal_sftp(struct sftp_conn *from, struct sftp_conn *to,
}
/* Did we actually get any matches back from the glob? */
- if (g.gl_matchc == 0 && g.gl_pathc == 1 && g.gl_pathv[0] != 0) {
+ if (g.gl_matchc == 0 && g.gl_pathc == 1 && g.gl_pathv[0] != NULL) {
/*
* If nothing matched but a path returned, then it's probably
* a GLOB_NOCHECK result. Check whether the unglobbed path
@@ -2223,7 +2223,7 @@ allocbuf(BUF *bp, int fd, int blksize)
if (fstat(fd, &stb) == -1) {
run_err("fstat: %s", strerror(errno));
- return (0);
+ return (NULL);
}
size = ROUNDUP(stb.st_blksize, blksize);
if (size == 0)
diff --git a/serverloop.c b/serverloop.c
index c8b1fd6db..5d3b194d1 100644
--- a/serverloop.c
+++ b/serverloop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: serverloop.c,v 1.243 2025/08/18 03:43:01 djm Exp $ */
+/* $OpenBSD: serverloop.c,v 1.244 2025/09/25 06:23:19 jsg Exp $ */
/*
* Author: Tatu Ylonen <ylo at cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo at cs.hut.fi>, Espoo, Finland
@@ -672,7 +672,7 @@ server_input_hostkeys_prove(struct ssh *ssh, struct sshbuf **respp)
int r, ndx, success = 0;
const u_char *blob;
const char *sigalg, *kex_rsa_sigalg = NULL;
- u_char *sig = 0;
+ u_char *sig = NULL;
size_t blen, slen;
if ((resp = sshbuf_new()) == NULL || (sigbuf = sshbuf_new()) == NULL)
diff --git a/sftp.c b/sftp.c
index ff85ab507..c77a608a8 100644
--- a/sftp.c
+++ b/sftp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp.c,v 1.242 2025/09/15 04:49:00 djm Exp $ */
+/* $OpenBSD: sftp.c,v 1.243 2025/09/25 06:23:19 jsg Exp $ */
/*
* Copyright (c) 2001-2004 Damien Miller <djm at openbsd.org>
*
@@ -2656,7 +2656,7 @@ main(int argc, char **argv)
} else {
if ((r = argv_split(sftp_direct, &tmp, &cpp, 1)) != 0)
fatal_r(r, "Parse -D arguments");
- if (cpp[0] == 0)
+ if (cpp[0] == NULL)
fatal("No sftp server specified via -D");
connect_to_server(cpp[0], cpp, &in, &out);
argv_free(cpp, tmp);
diff --git a/ssh-pkcs11.c b/ssh-pkcs11.c
index 809910e97..36b428223 100644
--- a/ssh-pkcs11.c
+++ b/ssh-pkcs11.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-pkcs11.c,v 1.70 2025/09/24 00:51:28 jsg Exp $ */
+/* $OpenBSD: ssh-pkcs11.c,v 1.71 2025/09/25 06:23:19 jsg Exp $ */
/*
* Copyright (c) 2010 Markus Friedl. All rights reserved.
* Copyright (c) 2014 Pedro Martelletto. All rights reserved.
@@ -552,7 +552,7 @@ pkcs11_sign_rsa(struct sshkey *key,
const u_char *oid;
if (sigp != NULL)
- *sigp = 0;
+ *sigp = NULL;
if (lenp != NULL)
*lenp = 0;
@@ -642,7 +642,7 @@ pkcs11_sign_ecdsa(struct sshkey *key,
int hashalg, ret = -1, r, siglen;
if (sigp != NULL)
- *sigp = 0;
+ *sigp = NULL;
if (lenp != NULL)
*lenp = 0;
@@ -727,7 +727,7 @@ pkcs11_sign_ed25519(struct sshkey *key,
int ret = -1;
if (sigp != NULL)
- *sigp = 0;
+ *sigp = NULL;
if (lenp != NULL)
*lenp = 0;
diff --git a/sshconnect.c b/sshconnect.c
index 0f260a2cd..912a520c5 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect.c,v 1.375 2025/09/15 04:49:41 djm Exp $ */
+/* $OpenBSD: sshconnect.c,v 1.376 2025/09/25 06:23:19 jsg Exp $ */
/*
* Author: Tatu Ylonen <ylo at cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo at cs.hut.fi>, Espoo, Finland
@@ -789,7 +789,7 @@ hostkeys_find_by_key(const char *host, const char *ip, const struct sshkey *key,
char **system_hostfiles, u_int num_system_hostfiles,
char ***names, u_int *nnames)
{
- struct find_by_key_ctx ctx = {0, 0, 0, 0, 0};
+ struct find_by_key_ctx ctx = {NULL, NULL, NULL, NULL, 0};
u_int i;
*names = NULL;
diff --git a/sshsig.c b/sshsig.c
index d84004ca9..3789c437b 100644
--- a/sshsig.c
+++ b/sshsig.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshsig.c,v 1.39 2025/09/15 04:52:41 djm Exp $ */
+/* $OpenBSD: sshsig.c,v 1.40 2025/09/25 06:23:19 jsg Exp $ */
/*
* Copyright (c) 2019 Google LLC
*
@@ -1128,7 +1128,7 @@ sshsig_match_principals(const char *path, const char *principal,
if (ret == 0) {
if (nprincipals == 0)
ret = SSH_ERR_KEY_NOT_FOUND;
- if (nprincipalsp != 0)
+ if (nprincipalsp != NULL)
*nprincipalsp = nprincipals;
if (principalsp != NULL) {
*principalsp = principals;
--
To stop receiving notification emails like this one, please contact
djm at mindrot.org.
More information about the openssh-commits
mailing list