-
Notifications
You must be signed in to change notification settings - Fork 331
Fix null pointer dereferences after dynamic_cast (rewritten) #2020
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.
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
jminor
wants to merge
7
commits into
AcademySoftwareFoundation:main
Choose a base branch
from
jminor:fix-null-ptr-deref-no-llm
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+206
−6
Open
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
774f1ce
Add tests for clone and clone-with-cycle
jminor 54cef4f
Prevent crash in algo::fill()
jminor 3ffb351
Fix crash in algo::insert
jminor 934380a
Fix crash in algo::overwrite
jminor cd70b27
Fixed crash in algo::fill() + some refactoring of tests
jminor d993049
Introduced ErrorStatus::CANNOT_CLONE_ITEM
jminor 7e8876a
Pass through error_status from clone() instead of inventing a new CAN…
jminor File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2131,6 +2131,125 @@ main(int argc, char** argv) | |
| TimeRange(RationalTime(0.0, 24.0), RationalTime(10.0, 24.0)) }); | ||
| }); | ||
|
|
||
| tests.add_test("regression: crash in slice", [] { | ||
| SerializableObject::Retainer<Clip> big_clip = new Clip( | ||
| "big clip", | ||
| nullptr, | ||
| TimeRange(RationalTime(0.0, 24.0), RationalTime(24.0, 24.0))); | ||
| big_clip->metadata()["cycle"] = big_clip; | ||
|
|
||
| SerializableObject::Retainer<Clip> small_clip = new Clip( | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It doesn't look like |
||
| "small clip", | ||
| nullptr, | ||
| TimeRange(RationalTime(0.0, 24.0), RationalTime(5.0, 24.0))); | ||
| small_clip->metadata()["cycle"] = small_clip; | ||
|
|
||
| SerializableObject::Retainer<Track> track = new Track(); | ||
| track->append_child(big_clip); | ||
|
|
||
| OTIO_NS::ErrorStatus error_status; | ||
|
|
||
| algo::slice(track, RationalTime(12.0, 24.0), false, &error_status); | ||
|
|
||
| assert(is_error(error_status)); | ||
| assert(error_status.outcome == OTIO_NS::ErrorStatus::TYPE_MISMATCH); | ||
| }); | ||
|
|
||
| tests.add_test("regression: crash in overwrite", [] { | ||
| SerializableObject::Retainer<Clip> big_clip = new Clip( | ||
| "big clip", | ||
| nullptr, | ||
| TimeRange(RationalTime(0.0, 24.0), RationalTime(24.0, 24.0))); | ||
| big_clip->metadata()["cycle"] = big_clip; | ||
|
|
||
| SerializableObject::Retainer<Clip> small_clip = new Clip( | ||
| "small clip", | ||
| nullptr, | ||
| TimeRange(RationalTime(0.0, 24.0), RationalTime(5.0, 24.0))); | ||
| small_clip->metadata()["cycle"] = small_clip; | ||
|
|
||
| SerializableObject::Retainer<Track> track = new Track(); | ||
| track->append_child(big_clip); | ||
|
|
||
| OTIO_NS::ErrorStatus error_status; | ||
|
|
||
| algo::overwrite( | ||
| small_clip, | ||
| track, | ||
| TimeRange(RationalTime(0.0, 24.0), RationalTime(12.0, 24.0)), | ||
| true, | ||
| nullptr, | ||
| &error_status); | ||
|
|
||
| assert(is_error(error_status)); | ||
| assert(error_status.outcome == OTIO_NS::ErrorStatus::TYPE_MISMATCH); | ||
| }); | ||
|
|
||
| tests.add_test("regression: crash in insert", [] { | ||
| SerializableObject::Retainer<Clip> big_clip = new Clip( | ||
| "big clip", | ||
| nullptr, | ||
| TimeRange(RationalTime(0.0, 24.0), RationalTime(24.0, 24.0))); | ||
| big_clip->metadata()["cycle"] = big_clip; | ||
|
|
||
| SerializableObject::Retainer<Clip> small_clip = new Clip( | ||
| "small clip", | ||
| nullptr, | ||
| TimeRange(RationalTime(0.0, 24.0), RationalTime(5.0, 24.0))); | ||
| small_clip->metadata()["cycle"] = small_clip; | ||
|
|
||
| SerializableObject::Retainer<Track> track = new Track(); | ||
| track->append_child(big_clip); | ||
|
|
||
| OTIO_NS::ErrorStatus error_status; | ||
|
|
||
| algo::insert( | ||
| small_clip, | ||
| track, | ||
| RationalTime(12.0, 24.0), | ||
| true, | ||
| nullptr, | ||
| &error_status); | ||
|
|
||
| assert(is_error(error_status)); | ||
| assert(error_status.outcome == OTIO_NS::ErrorStatus::TYPE_MISMATCH); | ||
| }); | ||
|
|
||
| tests.add_test("regression: crash in fill", [] { | ||
| SerializableObject::Retainer<Clip> big_clip = new Clip( | ||
| "big clip", | ||
| nullptr, | ||
| TimeRange(RationalTime(0.0, 24.0), RationalTime(24.0, 24.0))); | ||
| big_clip->metadata()["cycle"] = big_clip; | ||
|
|
||
| SerializableObject::Retainer<Clip> small_clip = new Clip( | ||
| "small clip", | ||
| nullptr, | ||
| TimeRange(RationalTime(0.0, 24.0), RationalTime(5.0, 24.0))); | ||
| small_clip->metadata()["cycle"] = small_clip; | ||
|
|
||
| SerializableObject::Retainer<Gap> gap = new Gap( | ||
| TimeRange(RationalTime(0.0, 24.0), RationalTime(20.0, 24.0)), | ||
| "gap"); | ||
|
|
||
| SerializableObject::Retainer<Track> track = new Track(); | ||
| track->append_child(small_clip); | ||
| track->append_child(gap); | ||
| track->append_child(small_clip); | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is adding the |
||
|
|
||
| OTIO_NS::ErrorStatus error_status; | ||
|
|
||
| algo::fill( | ||
| big_clip, | ||
| track, | ||
| RationalTime(12.0, 24.0), | ||
| ReferencePoint::Sequence, | ||
| &error_status); | ||
|
|
||
| assert(is_error(error_status)); | ||
| assert(error_status.outcome == OTIO_NS::ErrorStatus::TYPE_MISMATCH); | ||
| }); | ||
|
|
||
| tests.run(argc, argv); | ||
| return 0; | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not a big deal, but since the crash is fixed maybe the test name should change?