Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 15 additions & 7 deletions shell/platform/linux/testing/mock_engine.cc
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ struct _FlutterPlatformMessageResponseHandle {
bool released;

// Constructor for a response handle generated by the engine.
_FlutterPlatformMessageResponseHandle(std::string channel)
explicit _FlutterPlatformMessageResponseHandle(std::string channel)
: data_callback(nullptr),
user_data(nullptr),
channel(channel),
Expand Down Expand Up @@ -61,8 +61,12 @@ struct _FlutterTaskRunner {
channel(channel),
response_handle(response_handle),
message_size(message_size) {
this->message = static_cast<uint8_t*>(malloc(message_size));
memcpy(this->message, message, message_size);
if (message_size > 0) {
this->message = static_cast<uint8_t*>(malloc(message_size));
memcpy(this->message, message, message_size);
} else {
this->message = nullptr;
}
}
~_FlutterTaskRunner() {
if (response_handle != nullptr) {
Expand All @@ -80,8 +84,9 @@ static void send_response(
const FlutterPlatformMessageResponseHandle* response_handle,
const uint8_t* message,
size_t message_size) {
if (response_handle == nullptr)
if (response_handle == nullptr) {
return;
}

FlutterTask task;
task.runner = new _FlutterTaskRunner(1234, channel, response_handle, message,
Expand Down Expand Up @@ -146,8 +151,9 @@ FlutterEngineResult FlutterEngineRun(size_t version,

FlutterEngineResult result =
FlutterEngineInitialize(version, config, args, user_data, engine_out);
if (result != kSuccess)
if (result != kSuccess) {
return result;
}
return FlutterEngineRunInitialized(*engine_out);
}

Expand Down Expand Up @@ -254,8 +260,9 @@ FlutterEngineResult FlutterEngineSendPlatformMessage(
? fl_value_get_string(message_value)
: nullptr;
}
if (fl_value_get_length(args) >= 3)
if (fl_value_get_length(args) >= 3) {
details = fl_value_get_list_value(args, 2);
}
response = fl_method_codec_encode_error_envelope(
FL_METHOD_CODEC(codec), code, message, details, &error);
EXPECT_EQ(error, nullptr);
Expand Down Expand Up @@ -336,8 +343,9 @@ FlutterEngineResult FlutterEngineSendPlatformMessageResponse(
EXPECT_TRUE(engine->running);

// Send a message so the shell can check the responses received.
if (handle->channel != "test/responses")
if (handle->channel != "test/responses") {
send_message(engine, "test/responses", data, data_length);
}

EXPECT_FALSE(handle->released);

Expand Down