diff options
| author | Moonchild <moonchild@palemoon.org> | 2020-05-06 00:30:30 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2020-05-06 00:30:30 +0000 |
| commit | 789146fb7463980964462558bd1a93cc6a1eb643 (patch) | |
| tree | 7d842ae2b7d5e61e58e078a4a564f570c8975198 /dom/media/webaudio | |
| parent | c0401ee7015c6dc8d5ea1cbeb231255f01f8a1d0 (diff) | |
| download | uxp-789146fb7463980964462558bd1a93cc6a1eb643.tar.gz | |
[dom] Reorder some calls to improve memory safety
Diffstat (limited to 'dom/media/webaudio')
| -rw-r--r-- | dom/media/webaudio/AudioBuffer.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/dom/media/webaudio/AudioBuffer.cpp b/dom/media/webaudio/AudioBuffer.cpp index e7eba2d48a..e4252dfcf8 100644 --- a/dom/media/webaudio/AudioBuffer.cpp +++ b/dom/media/webaudio/AudioBuffer.cpp @@ -254,8 +254,6 @@ void AudioBuffer::CopyFromChannel(const Float32Array& aDestination, uint32_t aChannelNumber, uint32_t aStartInChannel, ErrorResult& aRv) { - aDestination.ComputeLengthAndData(); - uint32_t length = aDestination.Length(); CheckedInt<uint32_t> end = aStartInChannel; end += length; @@ -266,6 +264,7 @@ AudioBuffer::CopyFromChannel(const Float32Array& aDestination, uint32_t aChannel } JS::AutoCheckCannotGC nogc; + aDestination.ComputeLengthAndData(); JSObject* channelArray = mJSChannels[aChannelNumber]; const float* sourceData = nullptr; if (channelArray) { @@ -296,8 +295,6 @@ AudioBuffer::CopyToChannel(JSContext* aJSContext, const Float32Array& aSource, uint32_t aChannelNumber, uint32_t aStartInChannel, ErrorResult& aRv) { - aSource.ComputeLengthAndData(); - uint32_t length = aSource.Length(); CheckedInt<uint32_t> end = aStartInChannel; end += length; @@ -320,6 +317,7 @@ AudioBuffer::CopyToChannel(JSContext* aJSContext, const Float32Array& aSource, return; } + aSource.ComputeLengthAndData(); bool isShared = false; float* channelData = JS_GetFloat32ArrayData(channelArray, &isShared, nogc); // The channelData arrays should all have originated in |