diff options
author | Renato Botelho <renato@netgate.com> | 2016-01-25 08:56:15 -0200 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2016-01-25 08:56:15 -0200 |
commit | eb84e0723f3b4bc5e40024f66fe21c14b09e9ec4 (patch) | |
tree | fec6b99d018e13f1fccbe31478aaf29a28a55642 /contrib/ntp/sntp/libopts/nested.c | |
parent | c50df8e1b90c4f9b8bbffa592477c129854776ce (diff) | |
parent | 94b1bbbd44bd88b6db1c00d795cdf7675b3ae254 (diff) | |
download | FreeBSD-src-eb84e0723f3b4bc5e40024f66fe21c14b09e9ec4.zip FreeBSD-src-eb84e0723f3b4bc5e40024f66fe21c14b09e9ec4.tar.gz |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'contrib/ntp/sntp/libopts/nested.c')
-rw-r--r-- | contrib/ntp/sntp/libopts/nested.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/contrib/ntp/sntp/libopts/nested.c b/contrib/ntp/sntp/libopts/nested.c index f4fb226..aaf089f 100644 --- a/contrib/ntp/sntp/libopts/nested.c +++ b/contrib/ntp/sntp/libopts/nested.c @@ -859,6 +859,7 @@ LOCAL int get_special_char(char const ** ppz, int * ct) { char const * pz = *ppz; + char * rz; if (*ct < 3) return '&'; @@ -872,7 +873,8 @@ get_special_char(char const ** ppz, int * ct) base = 16; pz++; } - retch = (int)strtoul(pz, (char **)&pz, base); + retch = (int)strtoul(pz, &rz, base); + pz = rz; if (*pz != ';') return '&'; base = (int)(++pz - *ppz); |