Skip to content

Avoid clearing com_array object representation #1642

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Daniel Jump (DanielJump) wants to merge 2 commits into
base: master
Choose a base branch
from
+14 −2
Open

Avoid clearing com_array object representation #1642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e211f1
Avoid clearing com_array object representation
DanielJump Oct 30, 2026
7a78cfc
Share detached array state reset
DanielJump Oct 30, 2026
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
3 changes: 1 addition & 2 deletions strings/base_array.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,12 +382,11 @@ WINRT_EXPORT namespace winrt
std::memset(&result, 0, sizeof(result));
result.first = this->size();
result.second = *reinterpret_cast<impl::arg_out<T>*>(this);
std::memset(this, 0, sizeof(com_array<T>));
#else
std::pair<std::uint32_t, impl::arg_out<T>> result(this->size(), *reinterpret_cast<impl::arg_out<T>*>(this));
#endif
this->m_data = nullptr;
this->m_size = 0;
#endif
return result;
}

Expand Down
13 changes: 13 additions & 0 deletions test/old_tests/UnitTests/array.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1079,6 +1079,19 @@ TEST_CASE("com_array,move")
REQUIRE(b.empty());
}

TEST_CASE("com_array,detach")
{
com_array<int> a{ 1, 2, 3 };
auto detached = detach_abi(a);
com_array<int> b(detached.second, detached.first, take_ownership_from_abi);

REQUIRE(a.empty());
REQUIRE(3 == b.size());
REQUIRE(b[0] == 1);
REQUIRE(b[1] == 2);
REQUIRE(b[2] == 3);
}

//
// Now some tests covering producing and consuming arrays
//
Expand Down
Loading