musl - musl - an implementation of the standard library for Linux-based systems

musl - an implementation of the standard library for Linux-based systems

diff options

author	Rich Felker <dalias@aerifal.cx>	2012年04月16日 17:17:05 -0400
committer	Rich Felker <dalias@aerifal.cx>	2012年04月16日 17:17:05 -0400
commit	a4310aa2f592779118912fe5e7f6df4fd6b6d64a (patch)
tree	cd7e2961c3f1a22656890e6b4f011234ce0cd5aa /src/stdlib/wcstol.c
parent	96e9773eb764afa649b099a6e283dba4c69389a9 (diff)
download	musl-a4310aa2f592779118912fe5e7f6df4fd6b6d64a.tar.gz

avoid hitting eof in wcstol

shunget cannot unget eof status, causing wcstol to leave endptr pointing to the wrong place when scanning, for example, L"0x". cheap fix is to make the read function provide an infinite stream of bogus characters rather than eof. really this is something of a design flaw in how the shgetc system is used for strto* and wcsto*; in the long term, I believe multi-character unget should be scrapped and replaced with a function that can subtract from the f->shcnt counter.

Diffstat (limited to 'src/stdlib/wcstol.c')

-rw-r--r--

src/stdlib/wcstol.c

1 files changed, 3 insertions, 2 deletions

diff --git a/src/stdlib/wcstol.c b/src/stdlib/wcstol.c
index cbdd8067..822bcf1a 100644
--- a/src/stdlib/wcstol.c
+++ b/src/stdlib/wcstol.c

@@ -11,6 +11,7 @@ static size_t do_read(FILE *f, unsigned char *buf, size_t len)

size_t i;

const wchar_t *wcs = f->cookie;

+ if (!wcs[0]) wcs=L"@";

for (i=0; i<f->buf_size && wcs[i]; i++)

f->buf[i] = wcs[i] < 128 ? wcs[i] : '@';

f->rpos = f->buf;

@@ -30,8 +31,8 @@ static unsigned long long wcstox(const wchar_t *s, wchar_t **p, int base, unsign

FILE f = {0};

f.flags = 0;

f.rpos = f.rend = 0;

- f.buf = buf;

- f.buf_size = sizeof buf;

+ f.buf = buf + 4;

+ f.buf_size = sizeof buf - 4;

f.lock = -1;

f.read = do_read;

f.cookie = (void *)s;

generated by cgit v1.2.1 (git 2.18.0) at 2025年09月11日 15:51:15 +0000