From: deraadt@openbsd.org <deraadt@openbsd.org>
Date: Tue, 2 Apr 2024 09:56:58 +0000 (+0000)
Subject: upstream: can shortcut by returning strtonum() value directly; ok
X-Git-Tag: V_9_8_P1~121
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8176e1a6c2e6da9361a7abb6fbf6c23c299f495b;p=thirdparty%2Fopenssh-portable.git

upstream: can shortcut by returning strtonum() value directly; ok

djm

OpenBSD-Commit-ID: 7bb2dd3d6d1f288dac14247d1de446e3d7ba8b8e
---

diff --git a/misc.c b/misc.c
index a4ae95c94..fe6c4a514 100644
--- a/misc.c
+++ b/misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.c,v 1.191 2024/04/02 09:52:14 deraadt Exp $ */
+/* $OpenBSD: misc.c,v 1.192 2024/04/02 09:56:58 deraadt Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  * Copyright (c) 2005-2020 Damien Miller.  All rights reserved.
@@ -2428,13 +2428,10 @@ const char *
 atoi_err(const char *nptr, int *val)
 {
 	const char *errstr = NULL;
-	long long num;
 
 	if (nptr == NULL || *nptr == '\0')
 		return "missing";
-	num = strtonum(nptr, 0, INT_MAX, &errstr);
-	if (errstr == NULL)
-		*val = (int)num;
+	*val = strtonum(nptr, 0, INT_MAX, &errstr);
 	return errstr;
 }