diff options
| author | mmcc <mmcc@cvs.openbsd.org> | 2015-11-19 21:32:54 +0000 |
|---|---|---|
| committer | mmcc <mmcc@cvs.openbsd.org> | 2015-11-19 21:32:54 +0000 |
| commit | 6add882f0b5301a7618cec704a729d25f559c7c8 (patch) | |
| tree | 43808c5e8a49fac845d2f06e0614b7e5a796ec85 /sbin/iked/util.c | |
| parent | c99db105bf0d8e1dcf7449664582b6fc7cb28173 (diff) | |
Simplify all instances of get_string() and get_data() using malloc() and
strndup().
ok millert@
Diffstat (limited to 'sbin/iked/util.c')
| -rw-r--r-- | sbin/iked/util.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sbin/iked/util.c b/sbin/iked/util.c index 7b108de21e8..9363b19ca21 100644 --- a/sbin/iked/util.c +++ b/sbin/iked/util.c @@ -1,4 +1,4 @@ -/* $OpenBSD: util.c,v 1.27 2015/08/21 11:59:28 reyk Exp $ */ +/* $OpenBSD: util.c,v 1.28 2015/11/19 21:32:53 mmcc Exp $ */ /* * Copyright (c) 2010-2013 Reyk Floeter <reyk@openbsd.org> @@ -636,17 +636,12 @@ char * get_string(uint8_t *ptr, size_t len) { size_t i; - char *str; for (i = 0; i < len; i++) if (!isprint(ptr[i])) break; - if ((str = calloc(1, i + 1)) == NULL) - return (NULL); - memcpy(str, ptr, i); - - return (str); + return strndup(ptr, i); } const char * |