From ee6a43e5f0edaff98517a5bc23873af7253d8a38 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 24 Jul 2001 18:49:46 +0000 Subject: (__gconv_lookup_cache): Catch one more boundary case and reject it. --- iconv/gconv_cache.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'iconv/gconv_cache.c') diff --git a/iconv/gconv_cache.c b/iconv/gconv_cache.c index 20a30b6fdf..79e5dde629 100644 --- a/iconv/gconv_cache.c +++ b/iconv/gconv_cache.c @@ -324,11 +324,12 @@ __gconv_lookup_cache (const char *toset, const char *fromset, try_internal: /* See whether we can convert via the INTERNAL charset. */ if ((fromidx != 0 && __builtin_expect (from_module->fromname_offset, 1) == 0) - || (toidx != 0 && __builtin_expect (to_module->toname_offset, 1) == 0)) + || (toidx != 0 && __builtin_expect (to_module->toname_offset, 1) == 0) + || (fromidx == 0 && toidx == 0)) /* Not possible. Nothing we can do. */ return __GCONV_NOCONV; - /* Use the two modules. */ + /* We will use up to two modules. Always allocate room for two. */ result = (struct __gconv_step *) malloc (2 * sizeof (struct __gconv_step)); if (result == NULL) return __GCONV_NOMEM; -- cgit v1.2.3