From: deraadt <deraadt@openbsd.org>
Date: Tue, 2 Apr 2024 10:02:08 +0000 (+0000)
Subject: for parse_ipqos(), use strtonum() instead of mostly idiomatic strtoul(),
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=a05c59a9b363622b25ad18a4bd5bd69ff5d7d8a6;p=openbsd

for parse_ipqos(), use strtonum() instead of mostly idiomatic strtoul(),
but wow it's so gross.
ok djm
---

diff --git a/usr.bin/ssh/misc.c b/usr.bin/ssh/misc.c
index 67e33d5e299..36b1cbb478f 100644
--- a/usr.bin/ssh/misc.c
+++ b/usr.bin/ssh/misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.c,v 1.192 2024/04/02 09:56:58 deraadt Exp $ */
+/* $OpenBSD: misc.c,v 1.193 2024/04/02 10:02:08 deraadt Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  * Copyright (c) 2005-2020 Damien Miller.  All rights reserved.
@@ -1790,9 +1790,9 @@ static const struct {
 int
 parse_ipqos(const char *cp)
 {
+	const char *errstr;
 	u_int i;
-	char *ep;
-	long val;
+	int val;
 
 	if (cp == NULL)
 		return -1;
@@ -1801,8 +1801,8 @@ parse_ipqos(const char *cp)
 			return ipqos[i].value;
 	}
 	/* Try parsing as an integer */
-	val = strtol(cp, &ep, 0);
-	if (*cp == '\0' || *ep != '\0' || val < 0 || val > 255)
+	val = (int)strtonum(cp, 0, 255, &errstr);
+	if (errstr)
 		return -1;
 	return val;
 }