-
Notifications
You must be signed in to change notification settings - Fork 791
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
[20732] Fix some leaks in XML DynamicTypes Parser (backport #4717) #4735
Conversation
Cherry-pick of 8cb447b has failed:
To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally |
* Refs #20732. Add regression test. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20732. Fixes on parseXMLAliasDynamicType. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20732. Fixes on parseXMLBitsetDynamicType. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20732. Fixes on parseXMLBitmaskDynamicType. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20732. Fixes on parseXMLEnumDynamicType. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20732. Fixes on parseXMLStructDynamicType. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20732. Fixes on parseXMLUnionDynamicType. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20372. Return error when `insertDynamicTypeByName` fails. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20372. Fail parsing for empty name attributes. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20732. Move implementation of `DeleteInstance` to source file. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20732. Delete registered dynamic type builders in `XMLProfileManager::DeleteInstance()`. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> --------- Signed-off-by: Miguel Company <miguelcompany@eprosima.com> (cherry picked from commit 8cb447b) # Conflicts: # include/fastrtps/xmlparser/XMLProfileManager.h # test/unittest/xmlparser/XMLParserTests.cpp
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
d83b529
to
c124a1a
Compare
@richiprosima Please test this |
@Mergifyio backport 2.6.x |
✅ Backports have been created
|
@richiprosima Please test mac |
@richiprosima please test mac |
@richiprosima Please test mac |
* Fix some leaks in XML DynamicTypes Parser (#4717) * Refs #20732. Add regression test. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20732. Fixes on parseXMLAliasDynamicType. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20732. Fixes on parseXMLBitsetDynamicType. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20732. Fixes on parseXMLBitmaskDynamicType. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20732. Fixes on parseXMLEnumDynamicType. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20732. Fixes on parseXMLStructDynamicType. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20732. Fixes on parseXMLUnionDynamicType. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20372. Return error when `insertDynamicTypeByName` fails. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20372. Fail parsing for empty name attributes. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20732. Move implementation of `DeleteInstance` to source file. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20732. Delete registered dynamic type builders in `XMLProfileManager::DeleteInstance()`. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> --------- Signed-off-by: Miguel Company <miguelcompany@eprosima.com> (cherry picked from commit 8cb447b) # Conflicts: # include/fastrtps/xmlparser/XMLProfileManager.h # test/unittest/xmlparser/XMLParserTests.cpp * Fix conflicts Signed-off-by: Miguel Company <miguelcompany@eprosima.com> --------- Signed-off-by: Miguel Company <miguelcompany@eprosima.com> Co-authored-by: Miguel Company <miguelcompany@eprosima.com> (cherry picked from commit 04e90a2)
* Fix some leaks in XML DynamicTypes Parser (#4717) * Refs #20732. Add regression test. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20732. Fixes on parseXMLAliasDynamicType. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20732. Fixes on parseXMLBitsetDynamicType. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20732. Fixes on parseXMLBitmaskDynamicType. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20732. Fixes on parseXMLEnumDynamicType. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20732. Fixes on parseXMLStructDynamicType. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20732. Fixes on parseXMLUnionDynamicType. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20372. Return error when `insertDynamicTypeByName` fails. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20372. Fail parsing for empty name attributes. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20732. Move implementation of `DeleteInstance` to source file. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20732. Delete registered dynamic type builders in `XMLProfileManager::DeleteInstance()`. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> --------- Signed-off-by: Miguel Company <miguelcompany@eprosima.com> (cherry picked from commit 8cb447b) # Conflicts: # include/fastrtps/xmlparser/XMLProfileManager.h # test/unittest/xmlparser/XMLParserTests.cpp * Fix conflicts Signed-off-by: Miguel Company <miguelcompany@eprosima.com> --------- Signed-off-by: Miguel Company <miguelcompany@eprosima.com> Co-authored-by: Miguel Company <miguelcompany@eprosima.com> (cherry picked from commit 04e90a2)
* Fix some leaks in XML DynamicTypes Parser (#4717) (#4735) * Fix some leaks in XML DynamicTypes Parser (#4717) * Refs #20732. Add regression test. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20732. Fixes on parseXMLAliasDynamicType. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20732. Fixes on parseXMLBitsetDynamicType. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20732. Fixes on parseXMLBitmaskDynamicType. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20732. Fixes on parseXMLEnumDynamicType. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20732. Fixes on parseXMLStructDynamicType. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20732. Fixes on parseXMLUnionDynamicType. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20372. Return error when `insertDynamicTypeByName` fails. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20372. Fail parsing for empty name attributes. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20732. Move implementation of `DeleteInstance` to source file. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20732. Delete registered dynamic type builders in `XMLProfileManager::DeleteInstance()`. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> --------- Signed-off-by: Miguel Company <miguelcompany@eprosima.com> (cherry picked from commit 8cb447b) # Conflicts: # include/fastrtps/xmlparser/XMLProfileManager.h # test/unittest/xmlparser/XMLParserTests.cpp * Fix conflicts Signed-off-by: Miguel Company <miguelcompany@eprosima.com> --------- Signed-off-by: Miguel Company <miguelcompany@eprosima.com> Co-authored-by: Miguel Company <miguelcompany@eprosima.com> (cherry picked from commit 04e90a2) * Use old log macros Signed-off-by: Miguel Company <miguelcompany@eprosima.com> --------- Signed-off-by: Miguel Company <miguelcompany@eprosima.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> Co-authored-by: Miguel Company <miguelcompany@eprosima.com>
Description
This PR adds a regression test with the XML reported from OSS Fuzz, and performs the following two actions on every method parsing and registering a dynamic type:
#. Doing a pre-check on whether a type with the same name is already registered in the profile manager, and perform an early return in that case
#. Tell
DynamicTypeBuilderFactory
to delete the builder when a call toXMLProfileManager::insertDynamicTypeByName
fails.@Mergifyio backport 2.13.x 2.10.x 2.6.x
Contributor Checklist
Commit messages follow the project guidelines.
The code follows the style guidelines of this project.
Tests that thoroughly check the new feature have been added/Regression tests checking the bug and its fix have been added; the added tests pass locally
N/A Any new/modified methods have been properly documented using Doxygen.
N/A Any new configuration API has an equivalent XML API (with the corresponding XSD extension)
Changes are ABI compatible.
Changes are API compatible.
N/A New feature has been added to the
versions.md
file (if applicable).N/A New feature has been documented/Current behavior is correctly described in the documentation.
Applicable backports have been included in the description.
Reviewer Checklist
This is an automatic backport of pull request #4717 done by [Mergify](https://mergify.com).