diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2017-04-03 19:59:40 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2017-04-03 19:59:40 +0000 |
| commit | ddcca539dbc069fa23d4e84a2d1eec1156906096 (patch) | |
| tree | 1ddaf0278446b2f499fb947731f6c0d146b5b938 /sbin/dhclient/dhcpd.h | |
| parent | 2a18c7fd5d5f006405f1b816b94cb756cc608036 (diff) | |
Change parse_string() to take an optional integer pointer that can
be used to return the final size of the parsed (i.e. un-vis'ed)
string. Use same, plus memcpy() to ensure entire final string is
copied to intended destination even if there are embedded NULs.
Diffstat (limited to 'sbin/dhclient/dhcpd.h')
| -rw-r--r-- | sbin/dhclient/dhcpd.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sbin/dhclient/dhcpd.h b/sbin/dhclient/dhcpd.h index 907534d8924..ff24cc48f49 100644 --- a/sbin/dhclient/dhcpd.h +++ b/sbin/dhclient/dhcpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: dhcpd.h,v 1.161 2017/03/08 20:33:20 krw Exp $ */ +/* $OpenBSD: dhcpd.h,v 1.162 2017/04/03 19:59:39 krw Exp $ */ /* * Copyright (c) 2004 Henning Brauer <henning@openbsd.org> @@ -203,7 +203,7 @@ int peek_token(char **, FILE *); extern int warnings_occurred; void skip_to_semi(FILE *); int parse_semi(FILE *); -char *parse_string(FILE *); +char *parse_string(FILE *, int *); int parse_ip_addr(FILE *, struct in_addr *); int parse_cidr(FILE *, unsigned char *); void parse_ethernet(FILE *, struct ether_addr *); |