Browse Source

Simplify all instances of get_string() and get_data() using malloc() and

strndup().
ok millert@
OPENBSD_5_9
mmcc 9 years ago
parent
commit
c3ad325375
1 changed files with 2 additions and 7 deletions
  1. +2
    -7
      src/usr.sbin/ntpd/constraint.c

+ 2
- 7
src/usr.sbin/ntpd/constraint.c View File

@ -1,4 +1,4 @@
/* $OpenBSD: constraint.c,v 1.20 2015/11/17 15:34:36 deraadt Exp $ */
/* $OpenBSD: constraint.c,v 1.21 2015/11/19 21:32:53 mmcc Exp $ */
/* /*
* Copyright (c) 2015 Reyk Floeter <reyk@openbsd.org> * Copyright (c) 2015 Reyk Floeter <reyk@openbsd.org>
@ -979,15 +979,10 @@ char *
get_string(u_int8_t *ptr, size_t len) get_string(u_int8_t *ptr, size_t len)
{ {
size_t i; size_t i;
char *str;
for (i = 0; i < len; i++) for (i = 0; i < len; i++)
if (!(isprint(ptr[i]) || isspace(ptr[i]))) if (!(isprint(ptr[i]) || isspace(ptr[i])))
break; break;
if ((str = calloc(1, i + 1)) == NULL)
return (NULL);
memcpy(str, ptr, i);
return (str);
return strndup(ptr, i);
} }

Loading…
Cancel
Save