can pass ArrayBuffer to std::string

2 files changed, 9 insertions, 0 deletions

diff --git a/src/embind/embind.js b/src/embind/embind.js
index 078b5c1c..bd13087d 100755
--- a/src/embind/embind.js
+++ b/src/embind/embind.js
@@ -348,6 +348,10 @@ function __embind_register_std_string(rawType, name) {
             return a.join('');
         },
         toWireType: function(destructors, value) {
+            if (value instanceof ArrayBuffer) {
+                value = new Uint8Array(value);
+            }
+
             function getTAElement(ta, index) {
                 return ta[index];
             }
diff --git a/tests/embind/embind.test.js b/tests/embind/embind.test.js
index 821355d2..82029de4 100755
--- a/tests/embind/embind.test.js
+++ b/tests/embind/embind.test.js
@@ -419,6 +419,11 @@ module({
             assert.equal('ABCD', e);
         });
 
+        test("can pass ArrayBuffer to std::string", function() {
+            var e = cm.emval_test_take_and_return_std_string((new Int8Array([65, 66, 67, 68])).buffer);
+            assert.equal('ABCD', e);
+        });
+
         test("non-ascii wstrings", function() {
             var expected = String.fromCharCode(10) +
                 String.fromCharCode(1234) +