From 17ab9e8db1ddad310d7e2e565a9109d9a83cce72 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 24 Sep 2004 23:56:22 +0000 Subject: r2610: Even if we only use the fast-path (ascii only) then we still need to set errno = E2BIG when we overflow. Jeremy. (This used to be commit 7b0560dcccbd44f1f7b67ba1d46f6a5680b6b47c) --- source3/lib/charcnv.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'source3/lib') diff --git a/source3/lib/charcnv.c b/source3/lib/charcnv.c index 40004826b4..0fe1f15ed5 100644 --- a/source3/lib/charcnv.c +++ b/source3/lib/charcnv.c @@ -394,6 +394,13 @@ size_t convert_string(charset_t from, charset_t to, #endif } } + if (!dlen) { + /* Even if we fast path we should note if we ran out of room. */ + if (((slen != (size_t)-1) && slen) || + ((slen == (size_t)-1) && lastp)) { + errno = E2BIG; + } + } return retval; } else if (from == CH_UCS2 && to != CH_UCS2) { const unsigned char *p = (const unsigned char *)src; @@ -423,6 +430,13 @@ size_t convert_string(charset_t from, charset_t to, #endif } } + if (!dlen) { + /* Even if we fast path we should note if we ran out of room. */ + if (((slen != (size_t)-1) && slen) || + ((slen == (size_t)-1) && lastp)) { + errno = E2BIG; + } + } return retval; } else if (from != CH_UCS2 && to == CH_UCS2) { const unsigned char *p = (const unsigned char *)src; @@ -452,6 +466,13 @@ size_t convert_string(charset_t from, charset_t to, #endif } } + if (!dlen) { + /* Even if we fast path we should note if we ran out of room. */ + if (((slen != (size_t)-1) && slen) || + ((slen == (size_t)-1) && lastp)) { + errno = E2BIG; + } + } return retval; } -- cgit