From 81c40ab7c29e6bc59f4c10fa1655fd7e4a47a1ec Mon Sep 17 00:00:00 2001 From: Chris Young Date: Mon, 12 Apr 2021 23:26:17 +0100 Subject: [PATCH] Amiga: Fix codesets.library conversion when string specified as zero length --- frontends/amiga/utf8.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/frontends/amiga/utf8.c b/frontends/amiga/utf8.c index 2a4643b15..fabb1e24c 100755 --- a/frontends/amiga/utf8.c +++ b/frontends/amiga/utf8.c @@ -1,5 +1,5 @@ /* - * Copyright 2008-2020 Chris Young + * Copyright 2008-2021 Chris Young * * This file is part of NetSurf, http://www.netsurf-browser.org/ * @@ -35,7 +35,7 @@ static nserror ami_utf8_codesets(const char *string, size_t len, char **result, bool to_local) { char *out; - ULONG utf8_tag, local_tag; + ULONG utf8_tag = CSA_SourceCodeset, local_tag = CSA_DestCodeset, len_tag = CSA_SourceLen; static struct codeset *utf8_cs = NULL; static struct codeset *local_cs = NULL; @@ -54,13 +54,12 @@ static nserror ami_utf8_codesets(const char *string, size_t len, char **result, if(to_local == false) { local_tag = CSA_SourceCodeset; utf8_tag = CSA_DestCodeset; - } else { - utf8_tag = CSA_SourceCodeset; - local_tag = CSA_DestCodeset; } + if(len == 0) len_tag = TAG_IGNORE; + out = CodesetsConvertStr(CSA_Source, string, - CSA_SourceLen, len, + len_tag, len, #ifdef __amigaos4__ local_tag, local_cs, #endif