1 files changed, 73 insertions, 17 deletions

diff --git a/erts/emulator/beam/utils.c b/erts/emulator/beam/utils.c
index 457cada745..d7116bd2c3 100644
--- a/erts/emulator/beam/utils.c
+++ b/erts/emulator/beam/utils.c
@@ -42,6 +42,7 @@
 #include "dist.h"
 #include "erl_printf.h"
 #include "erl_threads.h"
+#include "erl_lock_count.h"
 #include "erl_smp.h"
 #include "erl_time.h"
 #include "erl_thr_progress.h"
@@ -51,6 +52,7 @@
 #include "erl_ptab.h"
 #include "erl_check_io.h"
 #include "erl_bif_unique.h"
+#include "erl_io_queue.h"
 #define ERTS_WANT_TIMER_WHEEL_API
 #include "erl_time.h"
 #ifdef HIPE
@@ -3634,13 +3636,78 @@ intlist_to_buf(Eterm list, char *buf, Sint len)
     return -2;			/* not enough space */
 }
 
-/* Fill buf with the contents of the unicode list.
- * Return the number of bytes in the buffer,
- * or -1 for type error,
- * or -2 for not enough buffer space (buffer contains truncated result).
+/** @brief Fill buf with the UTF8 contents of the unicode list
+ * @param len Max number of characters to write.
+ * @param written NULL or bytes written.
+ * @return 0 ok,
+ *        -1 type error,
+ *        -2 list too long, only \c len characters written
  */
+int
+erts_unicode_list_to_buf(Eterm list, byte *buf, Sint len, Sint* written)
+{
+    Eterm* listptr;
+    Sint sz = 0;
+    Sint val;
+    int res;
+
+    while (1) {
+        if (is_nil(list)) {
+            res = 0;
+            break;
+        }
+        if (is_not_list(list)) {
+            res = -1;
+            break;
+        }
+        listptr = list_val(list);
+
+        if (len-- <= 0) {
+            res = -2;
+            break;
+        }
+
+	if (is_not_small(CAR(listptr))) {
+	    res = -1;
+            break;
+	}
+	val = signed_val(CAR(listptr));
+	if (0 <= val && val < 0x80) {
+	    buf[sz] = val;
+	    sz++;
+	} else if (val < 0x800) {
+	    buf[sz+0] = 0xC0 | (val >> 6);
+	    buf[sz+1] = 0x80 | (val & 0x3F);
+	    sz += 2;
+	} else if (val < 0x10000UL) {
+	    if (0xD800 <= val && val <= 0xDFFF) {
+		res = -1;
+                break;
+	    }
+	    buf[sz+0] = 0xE0 | (val >> 12);
+	    buf[sz+1] = 0x80 | ((val >> 6) & 0x3F);
+	    buf[sz+2] = 0x80 | (val & 0x3F);
+	    sz += 3;
+	} else if (val < 0x110000) {
+	    buf[sz+0] = 0xF0 | (val >> 18);
+	    buf[sz+1] = 0x80 | ((val >> 12) & 0x3F);
+	    buf[sz+2] = 0x80 | ((val >> 6) & 0x3F);
+	    buf[sz+3] = 0x80 | (val & 0x3F);
+	    sz += 4;
+	} else {
+            res = -1;
+            break;
+	}
+	list = CDR(listptr);
+    }
+
+    if (written)
+        *written = sz;
+    return res;
+}
+
 Sint
-erts_unicode_list_to_buf(Eterm list, byte *buf, Sint len)
+erts_unicode_list_to_buf_len(Eterm list)
 {
     Eterm* listptr;
     Sint sz = 0;
@@ -3653,7 +3720,7 @@ erts_unicode_list_to_buf(Eterm list, byte *buf, Sint len)
     }
     listptr = list_val(list);
 
-    while (len-- > 0) {
+    while (1) {
 	Sint val;
 
 	if (is_not_small(CAR(listptr))) {
@@ -3661,25 +3728,15 @@ erts_unicode_list_to_buf(Eterm list, byte *buf, Sint len)
 	}
 	val = signed_val(CAR(listptr));
 	if (0 <= val && val < 0x80) {
-	    buf[sz] = val;
 	    sz++;
 	} else if (val < 0x800) {
-	    buf[sz+0] = 0xC0 | (val >> 6);
-	    buf[sz+1] = 0x80 | (val & 0x3F);
 	    sz += 2;
 	} else if (val < 0x10000UL) {
 	    if (0xD800 <= val && val <= 0xDFFF) {
 		return -1;
 	    }
-	    buf[sz+0] = 0xE0 | (val >> 12);
-	    buf[sz+1] = 0x80 | ((val >> 6) & 0x3F);
-	    buf[sz+2] = 0x80 | (val & 0x3F);
 	    sz += 3;
 	} else if (val < 0x110000) {
-	    buf[sz+0] = 0xF0 | (val >> 18);
-	    buf[sz+1] = 0x80 | ((val >> 12) & 0x3F);
-	    buf[sz+2] = 0x80 | ((val >> 6) & 0x3F);
-	    buf[sz+3] = 0x80 | (val & 0x3F);
 	    sz += 4;
 	} else {
 	    return -1;
@@ -3693,7 +3750,6 @@ erts_unicode_list_to_buf(Eterm list, byte *buf, Sint len)
 	}
 	listptr = list_val(list);
     }
-    return -2;			/* not enough space */
 }
 
 /*