runtime: Fix handling of surrogate pairs in string([]rune).

From-SVN: r205422

diff --git a/libgo/runtime/go-int-array-to-string.c b/libgo/runtime/go-int-array-to-string.c
index d93fe651d952d6d17e0e86c6d40c757eb803c30f..f37213125a2209cdebd98930b8b1c1d0efbc9b8f 100644 (file)
--- a/libgo/runtime/go-int-array-to-string.c
+++ b/libgo/runtime/go-int-array-to-string.c
@@ -30,6 +30,8 @@ __go_int_array_to_string (const void* p, intgo len)
 
       if (v < 0 || v > 0x10ffff)
        v = 0xfffd;
+      else if (0xd800 <= v && v <= 0xdfff)
+       v = 0xfffd;
 
       if (v <= 0x7f)
        slen += 1;
@@ -56,6 +58,8 @@ __go_int_array_to_string (const void* p, intgo len)
         character.  */
       if (v < 0 || v > 0x10ffff)
        v = 0xfffd;
+      else if (0xd800 <= v && v <= 0xdfff)
+       v = 0xfffd;
 
       if (v <= 0x7f)
        *s++ = v;