Fixed to work with backslashes too.

diff --git a/lib/silcutil/silcutf8.c b/lib/silcutil/silcutf8.c
index 372d900b8fc3d34c368c7c80ea27551719eb8c03..f53f7276062b75653cd6f51e2272bcdfc450d6ea 100644 (file)
--- 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 670cd3e1812b636bcb945b6895a770c294db7812..b647abec4111eeb86a6e4c46f97185393e895eb0 100644 (file)
--- 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, <foobar@foobar.com>\xc4\x8d ";
+  s1 = "#&?*Pekka, \\Riikonen, <foobar@foobar.com>\xc4\x8d\\ ";
   SILC_LOG_DEBUG(("s1 = %s", s1));
 
   /* To LDAP DN */