summaryrefslogtreecommitdiff
path: root/src/usr.bin/nc/netcat.c
diff options
context:
space:
mode:
authortedu <>2018-12-27 17:22:45 +0000
committertedu <>2018-12-27 17:22:45 +0000
commitb9643eff963a290c90472e3405d942eaa3e1f2ca (patch)
tree73d34fb5c2408c50eebaf03df59512c779515402 /src/usr.bin/nc/netcat.c
parent9641c932f4cf7d975c8a05c0ce14f13304cb4791 (diff)
downloadopenbsd-b9643eff963a290c90472e3405d942eaa3e1f2ca.tar.gz
openbsd-b9643eff963a290c90472e3405d942eaa3e1f2ca.tar.bz2
openbsd-b9643eff963a290c90472e3405d942eaa3e1f2ca.zip
port ranges can be ambiguous with hypenated port-names.
specify that ranges must be numeric, and only check for range if first argument is a digit. identified by danj, fix suggest by sthen
Diffstat (limited to 'src/usr.bin/nc/netcat.c')
-rw-r--r--src/usr.bin/nc/netcat.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/usr.bin/nc/netcat.c b/src/usr.bin/nc/netcat.c
index e0966f1952..adfad2dcd9 100644
--- a/src/usr.bin/nc/netcat.c
+++ b/src/usr.bin/nc/netcat.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: netcat.c,v 1.199 2018/11/29 14:25:06 tedu Exp $ */ 1/* $OpenBSD: netcat.c,v 1.200 2018/12/27 17:22:45 tedu Exp $ */
2/* 2/*
3 * Copyright (c) 2001 Eric Jackson <ericj@monkey.org> 3 * Copyright (c) 2001 Eric Jackson <ericj@monkey.org>
4 * Copyright (c) 2015 Bob Beck. All rights reserved. 4 * Copyright (c) 2015 Bob Beck. All rights reserved.
@@ -42,6 +42,7 @@
42#include <netinet/ip.h> 42#include <netinet/ip.h>
43#include <arpa/telnet.h> 43#include <arpa/telnet.h>
44 44
45#include <ctype.h>
45#include <err.h> 46#include <err.h>
46#include <errno.h> 47#include <errno.h>
47#include <limits.h> 48#include <limits.h>
@@ -1427,7 +1428,7 @@ build_ports(char *p)
1427 int hi, lo, cp; 1428 int hi, lo, cp;
1428 int x = 0; 1429 int x = 0;
1429 1430
1430 if ((n = strchr(p, '-')) != NULL) { 1431 if (isdigit((unsigned char)*p) && (n = strchr(p, '-')) != NULL) {
1431 *n = '\0'; 1432 *n = '\0';
1432 n++; 1433 n++;
1433 1434