diff options
| author | Alexandra Cherdantseva <neluhus.vagus@gmail.com> | 2020-01-29 17:38:41 +0300 |
|---|---|---|
| committer | Alexandra Cherdantseva <neluhus.vagus@gmail.com> | 2020-01-31 13:02:53 +0000 |
| commit | f998e630e74a8921e2e48e84fc0153ff81850def (patch) | |
| tree | 1c7c0b5b0e6e31a561338b6e7b1b1a1b54c07998 /src/plugins/platforms | |
| parent | 287b570ad5c00eb491f86eab0c4b8d3f6d96f666 (diff) | |
wasm: fix QWasmString::toQString assertion for emscripten 1.39.4
In emscripten 1.39.4 `maxBytesToWrite` argument is
required for function `stringToUTF16(str, outPtr, maxBytesToWrite)`
Fixes: QTBUG-81728
Change-Id: I634134a30454ae09a9a05593428397b40464b31f
Reviewed-by: jian liang <jianliang79@gmail.com>
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
Diffstat (limited to 'src/plugins/platforms')
| -rw-r--r-- | src/plugins/platforms/wasm/qwasmstring.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/platforms/wasm/qwasmstring.cpp b/src/plugins/platforms/wasm/qwasmstring.cpp index 05b571c459..b1be405eeb 100644 --- a/src/plugins/platforms/wasm/qwasmstring.cpp +++ b/src/plugins/platforms/wasm/qwasmstring.cpp @@ -52,9 +52,10 @@ QString QWasmString::toQString(const val &v) val::global("Module")["stringToUTF16"]); static const val length("length"); - result.resize(v[length].as<int>()); + int len = v[length].as<int>(); + result.resize(len); auto ptr = quintptr(result.utf16()); - stringToUTF16(v, val(ptr)); + stringToUTF16(v, val(ptr), val((len + 1) * 2)); return result; } |