Skip to content
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

Fix #871 -- double free if RenderableManager::Builder #886

Merged
merged 1 commit into from
Feb 25, 2019
Merged

Fix #871 -- double free if RenderableManager::Builder #886

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 20 additions & 22 deletions filament/src/components/RenderableManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,7 @@ using namespace details;

struct RenderableManager::BuilderDetails {
using Entry = RenderableManager::Builder::Entry;
Entry* mEntries = nullptr;
size_t mEntriesCount = 0;
std::vector<Entry> mEntries;
Box mAABB;
uint8_t mLayerMask = 0x1;
uint8_t mPriority = 0x4;
Expand All @@ -51,7 +50,7 @@ struct RenderableManager::BuilderDetails {
filament::math::mat4f const* mUserBoneMatrices = nullptr;

explicit BuilderDetails(size_t count)
: mEntriesCount(count), mCulling(true), mCastShadows(false), mReceiveShadows(true) {
: mEntries(count), mCulling(true), mCastShadows(false), mReceiveShadows(true) {
}
// this is only needed for the explicit instantiation below
BuilderDetails() = default;
Expand All @@ -60,11 +59,9 @@ struct RenderableManager::BuilderDetails {
using BuilderType = RenderableManager;
BuilderType::Builder::Builder(size_t count) noexcept
: BuilderBase<RenderableManager::BuilderDetails>(count) {
mImpl->mEntries = new Entry[count];
}
BuilderType::Builder::~Builder() noexcept {
delete [] mImpl->mEntries;
assert(mImpl->mEntries.size() == count);
}
BuilderType::Builder::~Builder() noexcept = default;
BuilderType::Builder::Builder(BuilderType::Builder&& rhs) noexcept = default;
BuilderType::Builder& BuilderType::Builder::operator=(BuilderType::Builder&& rhs) noexcept = default;

Expand All @@ -85,21 +82,22 @@ RenderableManager::Builder& RenderableManager::Builder::geometry(size_t index,
RenderableManager::Builder& RenderableManager::Builder::geometry(size_t index,
PrimitiveType type, VertexBuffer* vertices, IndexBuffer* indices,
size_t offset, size_t minIndex, size_t maxIndex, size_t count) noexcept {
if (index < mImpl->mEntriesCount) {
mImpl->mEntries[index].vertices = vertices;
mImpl->mEntries[index].indices = indices;
mImpl->mEntries[index].offset = offset;
mImpl->mEntries[index].minIndex = minIndex;
mImpl->mEntries[index].maxIndex = maxIndex;
mImpl->mEntries[index].count = count;
mImpl->mEntries[index].type = type;
std::vector<Entry>& entries = mImpl->mEntries;
if (index < entries.size()) {
entries[index].vertices = vertices;
entries[index].indices = indices;
entries[index].offset = offset;
entries[index].minIndex = minIndex;
entries[index].maxIndex = maxIndex;
entries[index].count = count;
entries[index].type = type;
}
return *this;
}

RenderableManager::Builder& RenderableManager::Builder::material(size_t index,
MaterialInstance const* materialInstance) noexcept {
if (index < mImpl->mEntriesCount) {
if (index < mImpl->mEntries.size()) {
mImpl->mEntries[index].materialInstance = materialInstance;
}
return *this;
Expand Down Expand Up @@ -155,7 +153,7 @@ RenderableManager::Builder& RenderableManager::Builder::skinning(
}

RenderableManager::Builder& RenderableManager::Builder::blendOrder(size_t index, uint16_t blendOrder) noexcept {
if (index < mImpl->mEntriesCount) {
if (index < mImpl->mEntries.size()) {
mImpl->mEntries[index].blendOrder = blendOrder;
}
return *this;
Expand All @@ -169,7 +167,7 @@ RenderableManager::Builder::Result RenderableManager::Builder::build(Engine& eng
return Error;
}

for (size_t i = 0, c = mImpl->mEntriesCount; i < c; i++) {
for (size_t i = 0, c = mImpl->mEntries.size(); i < c; i++) {
auto& entry = mImpl->mEntries[i];

// entry.materialInstance must be set to something even if indices/vertices are null
Expand Down Expand Up @@ -264,12 +262,12 @@ void FRenderableManager::create(
if (ci) {
// create and initialize all needed RenderPrimitives
using size_type = Slice<FRenderPrimitive>::size_type;
Builder::Entry const * const entries = builder->mEntries;
FRenderPrimitive* rp = new FRenderPrimitive[builder->mEntriesCount];
for (size_t i = 0, c = builder->mEntriesCount; i < c; ++i) {
Builder::Entry const * const entries = builder->mEntries.data();
FRenderPrimitive* rp = new FRenderPrimitive[builder->mEntries.size()];
for (size_t i = 0, c = builder->mEntries.size(); i < c; ++i) {
rp[i].init(driver, entries[i]);
}
setPrimitives(ci, { rp, size_type(builder->mEntriesCount) });
setPrimitives(ci, { rp, size_type(builder->mEntries.size()) });

setAxisAlignedBoundingBox(ci, builder->mAABB);
setLayerMask(ci, builder->mLayerMask);
Expand Down