nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1865617 - RemoteDataDecoder::Decode should handle OOM. r=geckoview-reviewers,media-playback-reviewers,owlish,jolin

Browse source 
According to crash data, `NewDirectByteBuffer` throws OOM exception.
`RemoteDataDecoder::Decode` can return the error, so I should use fallible
version of it.

Differential Revision: https://phabricator.services.mozilla.com/D194199
This commit is contained in:
Makoto Kato 2023-11-27 08:33:51 +00:00
parent e7e16e453b
commit e07a314dc7
2 changed files with 24 additions and 1 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

7
dom/media/platforms/android/RemoteDataDecoder.cpp
View file

@ -19,6 +19,7 @@
#include "SimpleMap.h" #include "SimpleMap.h"
#include "VPXDecoder.h" #include "VPXDecoder.h"
#include "VideoUtils.h" #include "VideoUtils.h"
#include "mozilla/fallible.h"
#include "mozilla/gfx/Matrix.h" #include "mozilla/gfx/Matrix.h"
#include "mozilla/gfx/Types.h" #include "mozilla/gfx/Types.h"
#include "mozilla/java/CodecProxyWrappers.h" #include "mozilla/java/CodecProxyWrappers.h"
@ -1019,7 +1020,11 @@ RefPtr<MediaDataDecoder::DecodePromise> RemoteDataDecoder::Decode(
MOZ_ASSERT(GetState() != State::SHUTDOWN); MOZ_ASSERT(GetState() != State::SHUTDOWN);
MOZ_ASSERT(aSample != nullptr); MOZ_ASSERT(aSample != nullptr);
jni::ByteBuffer::LocalRef bytes = jni::ByteBuffer::New( jni::ByteBuffer::LocalRef bytes = jni::ByteBuffer::New(
const_cast<uint8_t*>(aSample->Data()), aSample->Size()); const_cast<uint8_t*>(aSample->Data()), aSample->Size(), fallible);
if (!bytes) {
return DecodePromise::CreateAndReject(
MediaResult(NS_ERROR_OUT_OF_MEMORY, __func__), __func__);
}
SetState(State::DRAINABLE); SetState(State::DRAINABLE);
MOZ_ASSERT(aSample->Size() <= INT32_MAX); MOZ_ASSERT(aSample->Size() <= INT32_MAX);

18
widget/android/jni/Refs.h
View file

@ -976,6 +976,24 @@ class ByteBuffer : public ObjectBase<ByteBuffer, jobject> {
return ret; return ret;
} }
static LocalRef New(void* data, size_t capacity, const fallible_t&) {
JNIEnv* const env = GetEnvForThread();
const jobject result = env->NewDirectByteBuffer(data, jlong(capacity));
if (env->ExceptionCheck()) {
if (!IsOOMException(env)) {
// This exception isn't excepted due not to OOM. This is unrecoverable
// error.
MOZ_CATCH_JNI_EXCEPTION(env);
}
#ifdef MOZ_CHECK_JNI
env->ExceptionDescribe();
#endif
env->ExceptionClear();
return LocalRef::Adopt(env, nullptr);
}
return LocalRef::Adopt(env, result);
}
void* Address() { void* Address() {
void* const ret = Env()->GetDirectBufferAddress(Instance()); void* const ret = Env()->GetDirectBufferAddress(Instance());
MOZ_CATCH_JNI_EXCEPTION(Env()); MOZ_CATCH_JNI_EXCEPTION(Env());