From e0155338559872e751123089d4deefeef90fa609 Mon Sep 17 00:00:00 2001 From: Nikolay Igotti Date: Fri, 24 Jan 2025 12:03:00 +0300 Subject: [PATCH 1/2] Better ctors Signed-off-by: Nikolay Igotti --- interop/src/cpp/SerializerBase.h | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/interop/src/cpp/SerializerBase.h b/interop/src/cpp/SerializerBase.h index 5cd41d1e6..ccde99284 100644 --- a/interop/src/cpp/SerializerBase.h +++ b/interop/src/cpp/SerializerBase.h @@ -79,14 +79,18 @@ private: data = newData; } public: - SerializerBase(uint8_t* data = nullptr, uint32_t dataLength = 0, CallbackResourceHolder* resourceHolder = nullptr): - data(data), dataLength(dataLength), position(0), ownData(data == nullptr), resourceHolder(resourceHolder) { - if (data == nullptr) { - this->dataLength = 256; - this->data = reinterpret_cast(malloc(dataLength)); - } + SerializerBase(CallbackResourceHolder* resourceHolder = nullptr): + data(data), dataLength(dataLength), position(0), ownData(true), resourceHolder(resourceHolder) { + } + SerializerBase(uint8_t* data, uint32_t dataLength, CallbackResourceHolder* resourceHolder = nullptr): + data(data), dataLength(dataLength), position(0), ownData(false), resourceHolder(resourceHolder) { + this->dataLength = 256; + this->data = reinterpret_cast(malloc(this->dataLength)); + } + + ~SerializerBase() { if (ownData) { free(data); -- Gitee From 4fdefc1471ed7f02198c1475cb246404741db335 Mon Sep 17 00:00:00 2001 From: Nikolay Igotti Date: Fri, 24 Jan 2025 14:21:59 +0300 Subject: [PATCH 2/2] Update Signed-off-by: Nikolay Igotti --- interop/src/cpp/SerializerBase.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/interop/src/cpp/SerializerBase.h b/interop/src/cpp/SerializerBase.h index ccde99284..e4fdb9abd 100644 --- a/interop/src/cpp/SerializerBase.h +++ b/interop/src/cpp/SerializerBase.h @@ -80,17 +80,15 @@ private: } public: SerializerBase(CallbackResourceHolder* resourceHolder = nullptr): - data(data), dataLength(dataLength), position(0), ownData(true), resourceHolder(resourceHolder) { - + position(0), ownData(true), resourceHolder(resourceHolder) { + this->dataLength = 256; + this->data = reinterpret_cast(malloc(this->dataLength)); } SerializerBase(uint8_t* data, uint32_t dataLength, CallbackResourceHolder* resourceHolder = nullptr): data(data), dataLength(dataLength), position(0), ownData(false), resourceHolder(resourceHolder) { - this->dataLength = 256; - this->data = reinterpret_cast(malloc(this->dataLength)); } - ~SerializerBase() { if (ownData) { free(data); -- Gitee