From a2383b317b9d082d5d8d1661d61adc3d902efa83 Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Sat, 22 Sep 2012 07:18:45 +0000
Subject: [PATCH] runtime: Reject surrogate pairs in range over string.

From-SVN: r191638
---
 libgo/runtime/go-rune.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/libgo/runtime/go-rune.c b/libgo/runtime/go-rune.c
index 7e31eb8d6229..acdecb02467b 100644
--- a/libgo/runtime/go-rune.c
+++ b/libgo/runtime/go-rune.c
@@ -53,6 +53,14 @@ __go_get_rune (const unsigned char *str, size_t len, int *rune)
       *rune = (((c & 0xf) << 12)
 	       + ((c1 & 0x3f) << 6)
 	       + (c2 & 0x3f));
+
+      if (*rune >= 0xd800 && *rune < 0xe000)
+	{
+	  /* Invalid surrogate half; return replace character.  */
+	  *rune = 0xfffd;
+	  return 1;
+	}
+
       return 3;
     }
 
-- 
2.47.2