Skip to content

Fix null-pointer crash when a STREAMING object isn't a manifest #67

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

Closed
jordijoangimenez wants to merge 1 commit into from
Closed

Fix null-pointer crash when a STREAMING object isn't a manifest #67

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
11 changes: 11 additions & 0 deletions src/mbstf/ObjectStreamingController.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,17 @@ void ObjectStreamingController::processEvent(Event &event, SubscriptionService &

} else {
std::unique_ptr<ManifestHandler> manifest_handler(ManifestHandlerFactory::makeManifestHandler(object, this, distributionSession().getObjectAcquisitionMethod() == "PULL"));
if (!manifest_handler) {
// No registered handler recognised this object's media type as a manifest
// (e.g. it matched getManifestUrl() spuriously, or genuinely isn't a
// supported manifest format). Storing/using a null handler here crashes
// later at the first manifestHandler()->... call, which asserts rather
// than null-checks (see LibFlute/shared_ptr_deref) -- mirror
// ObjectCarouselController's handling of this exact case instead.
ogs_error("Could not find suitable manifest handler for object %s", object_id.c_str());
sendToPackager(object);
return;
}
manifestHandler(std::move(manifest_handler));
sendToPackager(object);
}
Expand Down
Loading