From 214b6c3768610da3c56ae996e4d30eca623388c7 Mon Sep 17 00:00:00 2001 From: Pekka Riikonen Date: Tue, 29 Mar 2005 08:50:02 +0000 Subject: [PATCH] Fixed to work with backslashes too. --- lib/silcutil/silcutf8.c | 16 +++++++++------- lib/silcutil/tests/test_silcstrutil.c | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/lib/silcutil/silcutf8.c b/lib/silcutil/silcutf8.c index 372d900b..f53f7276 100644 --- a/lib/silcutil/silcutf8.c +++ b/lib/silcutil/silcutf8.c @@ -75,15 +75,17 @@ SilcUInt32 silc_utf8_encode(const unsigned char *bin, SilcUInt32 bin_len, i += 2; enclen++; + continue; } - } else { - if (utf8) { - if (enclen + 1 > utf8_size) - return 0; - utf8[enclen] = bin[i]; - } - enclen++; + i++; } + + if (utf8) { + if (enclen + 1 > utf8_size) + return 0; + utf8[enclen] = bin[i]; + } + enclen++; } return enclen; diff --git a/lib/silcutil/tests/test_silcstrutil.c b/lib/silcutil/tests/test_silcstrutil.c index 670cd3e1..b647abec 100644 --- a/lib/silcutil/tests/test_silcstrutil.c +++ b/lib/silcutil/tests/test_silcstrutil.c @@ -78,7 +78,7 @@ int main(int argc, char **argv) utf8failc(29); utf8failc(30); /* LDAP DN simple test */ - s1 = "#&?*Pekka, Riikonen, \xc4\x8d "; + s1 = "#&?*Pekka, \\Riikonen, \xc4\x8d\\ "; SILC_LOG_DEBUG(("s1 = %s", s1)); /* To LDAP DN */ -- 2.43.0