diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/react/common/mapbuffer/ReadableMapBuffer.cpp b/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/react/common/mapbuffer/ReadableMapBuffer.cpp index a04dfe95837..f8042542745 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/react/common/mapbuffer/ReadableMapBuffer.cpp +++ b/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/react/common/mapbuffer/ReadableMapBuffer.cpp @@ -26,9 +26,9 @@ ReadableMapBuffer::importByteBufferAllocateDirect() { // steps: // - Validate perf of this method vs importByteBuffer // - Validate that there's no leaking of memory - auto ret = jni::JByteBuffer::allocateDirect(_serializedDataSize); + auto ret = jni::JByteBuffer::allocateDirect(serializedDataSize_); std::memcpy( - ret->getDirectBytes(), (void *)_serializedData, _serializedDataSize); + ret->getDirectBytes(), (void *)serializedData_, serializedDataSize_); return ret; } @@ -47,7 +47,7 @@ jni::JByteBuffer::javaobject ReadableMapBuffer::importByteBuffer() { // transfer data of multitple Maps return static_cast( jni::Environment::current()->NewDirectByteBuffer( - (void *)_serializedData, _serializedDataSize)); + (void *)serializedData_, serializedDataSize_)); } jni::local_ref @@ -56,9 +56,11 @@ ReadableMapBuffer::createWithContents(MapBuffer &&map) { } ReadableMapBuffer::~ReadableMapBuffer() { - delete[] _serializedData; - _serializedData = nullptr; - _serializedDataSize = 0; + if (serializedData_ != nullptr) { + delete[] serializedData_; + serializedData_ = nullptr; + } + serializedDataSize_ = 0; } } // namespace react diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/react/common/mapbuffer/ReadableMapBuffer.h b/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/react/common/mapbuffer/ReadableMapBuffer.h index 6ead62098e0..6a231bd29be 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/react/common/mapbuffer/ReadableMapBuffer.h +++ b/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/react/common/mapbuffer/ReadableMapBuffer.h @@ -32,18 +32,18 @@ class ReadableMapBuffer : public jni::HybridClass { ~ReadableMapBuffer(); private: - uint8_t *_serializedData = nullptr; + uint8_t *serializedData_ = nullptr; - int _serializedDataSize = 0; + int serializedDataSize_ = 0; friend HybridBase; explicit ReadableMapBuffer(MapBuffer &&map) { - _serializedDataSize = map.getBufferSize(); + serializedDataSize_ = map.getBufferSize(); react_native_assert( - (_serializedDataSize != 0) && "Error no content in map"); - _serializedData = new Byte[_serializedDataSize]; - map.copy(_serializedData); + (serializedDataSize_ != 0) && "Error no content in map"); + serializedData_ = new Byte[serializedDataSize_]; + map.copy(serializedData_); } };