[PATCH 1/4] libc/iconv: Detect CES handler loading failure

Keith Packard via Newlib <[email protected]> Thu, 9 Jul 2020 16:58:45 -0700

Newsgroups	gmane.comp.lib.newlib
Message-ID	<[email protected]>

Fix the code checking for character set loading failure so that
it checks the return value from the init function.

Signed-off-by: Keith Packard <[email protected]>
---
 newlib/libc/iconv/ces/euc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/newlib/libc/iconv/ces/euc.c b/newlib/libc/iconv/ces/euc.c
index 29d36f941..ebd7091b0 100644
--- a/newlib/libc/iconv/ces/euc.c
+++ b/newlib/libc/iconv/ces/euc.c
@@ -306,7 +306,7 @@ ok:
       data->data[i] = _iconv_to_ucs_ces_handlers_table.init (
                                                         rptr,
                                                         data->desc[i].csname);
-      if (data->data == NULL)
+      if (data->data[i] == NULL)
         goto error;
     } 
 
-- 
2.27.0