Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: emscripten-core/emscripten
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: bvibber/emscripten
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: intArrayToString
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Sep 21, 2019

  1. Update intArrayToString to match docs, and update docs 

    intArrayToString is documented as taking null-terminated input,
but previously did not stop at a 0 entry.

Switched it to use UTF8ArrayToString internally using the
array length as maximum length. This both fixes the discrepancy
with the documentation by allowing 0-terminated input arrays,
and improves general compatibility by allowing input data to
contain UTF-8 strings without being corrupted on output to
JavaScript.

Updated documentation for both intArrayToString and its
almost-inverse, intArrayFromString, to indicate that UTF-8
is used (this was already the case, but not documented,
for intArrayFromString).

Fixes #4840
    @bvibber
    bvibber committed Sep 21, 2019
    Copy the full SHA
    cc18cd8 View commit details
Showing with 3 additions and 14 deletions.
  1. +2 −2 site/source/docs/api_reference/preamble.js.rst
  2. +1 −12 src/arrayUtils.js
4 changes: 2 additions & 2 deletions site/source/docs/api_reference/preamble.js.rst
View file
Original file line number Diff line number Diff line change
@@ -234,7 +234,7 @@ Conversion functions — strings, pointers and arrays

.. js:function:: intArrayFromString(stringy, dontAddNull[, length])

This converts a JavaScript string into a C-line array of numbers, 0-terminated.
This converts a JavaScript string into a C-line array of numbers, 0-terminated, encoded as UTF-8.

:param stringy: The string to be converted.
:type stringy: String
@@ -246,7 +246,7 @@ Conversion functions — strings, pointers and arrays

.. js:function:: intArrayToString(array)

This creates a JavaScript string from a zero-terminated C-line array of numbers.
This creates a JavaScript string from an optionally zero-terminated C-line array of numbers, interpreted as UTF-8.

:param array: The array to convert.
:returns: A ``String``, containing the content of ``array``.
13 changes: 1 addition & 12 deletions src/arrayUtils.js
View file
Original file line number Diff line number Diff line change
@@ -13,16 +13,5 @@ function intArrayFromString(stringy, dontAddNull, length) {
}

function intArrayToString(array) {
var ret = [];
for (var i = 0; i < array.length; i++) {
var chr = array[i];
if (chr > 0xFF) {
if (ASSERTIONS) {
assert(false, 'Character code ' + chr + ' (' + String.fromCharCode(chr) + ') at offset ' + i + ' not in 0x00-0xFF.');
}
chr &= 0xFF;
}
ret.push(String.fromCharCode(chr));
}
return ret.join('');
return UTF8ArrayToString(array, 0, array.length);
}