Feature/merge bs1.91 #5394
Merged
Feature/merge bs1.91 #5394
Conversation
This file contains 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
I found a use after free bug in LinesBucketQueue::emplace_back_bucket. This was found by enabling address sanitizer.
The LinesBucketQueue class has two related members:
std::vector<LinesBucket> line_buckets;
std::priority_queue<LinesBucket *, std::vector<LinesBucket *>, LinesBucketPtrComp> line_bucket_ptr_queue;
line_bucket_ptr_queue holds pointers into line_buckets. However, since items are inserted into line_buckets one at a time, existing pointers that were stored inside line_bucket_ptr_queue become invalid. Specifically:
void LinesBucketQueue::emplace_back_bucket(ExtrusionLayers &&els, const void *objPtr, Point offset)
{
auto oldSize = line_buckets.capacity();
line_buckets.emplace_back(std::move(els), objPtr, offset); <--- Causes a reallocation, making previous pointers invalid
line_bucket_ptr_queue.push(&line_buckets.back()); <-- priority queue compares against old, now invalid pointers
...
The proposed fix is to calculate the required number of entries in ConflictChecker::find_inter_of_lines_in_diff_objs, and then calling line_buckets.reserve(count). This ensures that sufficient buffer is allocated up front and the pointers are stable as items are added.
…ode I previously added to reserve upfront since it is not really needed
to solove plugin install failed problem by special wide char jira: none Change-Id: Ic7d3efe3fdf852387650abf9df65803da9e46a60 (cherry picked from commit b68ad03717a63675fef2f3ef73d4058bf311adea)
Change-Id: I99d6ff7f6dcb1f53ccf59854f5f19d0bd39fa9fc Jira: none
jira: none Change-Id: I61a0156a8424a5f59922956918d37d38e2c3306a
Jira: 6469 Change-Id: I4097e3a3b018c7a676fea93bf63f8f778bb3148b
jira:[STUDIO-6220] Change-Id: Id1f084658b0b340b7f17ab97ba82c0fd3ae83fae
jira: none Change-Id: I0d20464dbe81a80293539100f06d72dee456a27b (cherry picked from commit 94746ae9bf7f467243849570450567b4fdc78e3a)
jira: none Change-Id: I40e7ffa7ea47bb3cd4039eef9f6c28c604eb3abc
Change-Id: I891aaa8d58ff379dc1ebd8581064865a33388f74
Change-Id: I96dc45102a2759a9f1a0002f42c3a91b2c6b2d75 Jira: STUDIO-5947 (cherry picked from commit 97d687b7c88f8cd51b8eddd39120349d8eac42b1)
JIRA: STUDIO-6934 STUDIO-6888 1. Fix the issue of incomplete display caused by excessively long file names 2. Fix the issue of icon display being too large 3. Fix the issue of garbled Chinese characters in the task list Change-Id: I36bc10bf2067f44aaa7e3651b58e526ea323c8ad
1.wipe tower pos in 3mf was overwritten by default pos when opening 3mf with a different printer profile.This patch fix it jira: STUDIO-5890 Signed-off-by: xun.zhang <[email protected]> Change-Id: I12e5d4b80a0ad86194db0682c1763ba4a9492521
1.Adjust the y position of the A1 extrusion compensation line jira:NEW Signed-off-by: xun.zhang <[email protected]> Change-Id: Iea690a0184ae10a47f53e1532272c31fc0a04cfa
github:#3477 Signed-off-by: xun.zhang <[email protected]> Change-Id: Id3201bf8b8125ce060e2cac102ab2525877e27c1
github: 3917 Change-Id: Icdf83013213b47935b7a795ed75cc3d49057665d
Change-Id: Ifde1a7b0c6ab915eb226c2072c46edd40f60cf9a Jira: STUDIO-6436
jira:[STUDIO-6850] Change-Id: Ic537579727fd1618af364db93fce8fbbe4cd635a
jira: STUDIO-5531 Change-Id: Icddc9d73b3d91bb68e9768d13e48cbae0680e58e
Change-Id: Id6750cfa2a98fe8325ba677dabb606a0a701b495
jira: STUDIO-6325 Change-Id: Ic7fb8cef000c03210bb77289a570ee6b60b6083e
Change-Id: Ib42194c07b6eefe793eec81a588debc9d622d951
jira: STUDIO-6264 Change-Id: I24fbc590638a3213d948a973422e010486113923
github PR: #3948 Signed-off-by: xun.zhang <[email protected]> Change-Id: I28e4a673e590e83d151e92cc82caab45012aeabe
jira: none Change-Id: I4d68d8cd8e080932c7c308bc8f69e27546ffe309
jira: STUDIO-5889 Change-Id: I622f4b474c378d77b0e43d67a320f023be2d5811
jira:[for nozzle check] Change-Id: I9a932b833fb07de6cb0a91abe6372b0e91f273f1
1.Modify the width of extrusion compensation line jira:NEW Signed-off-by: xun.zhang <[email protected]> Change-Id: I90543758c866d74f2154e3135d7569109def84b8
github: 3876 Change-Id: Id38672bbf0c01bc9b9f0a3e2bf1052d945b45131
jira: STUDIO-6264 Change-Id: If210abf64057eb2e9c2c5b11d41fa33f18684c72
jira:[STUDIO-7050] Change-Id: I15ca4973d09132ddb5cb5a56bedd795ba6976b27
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
Screenshots/Recordings/Graphs
Tests