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.

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 crash on empty polygon conversion to curve #50577

Merged
merged 1 commit into from
Oct 17, 2022

Conversation

strk
Copy link
Contributor

@strk strk commented Oct 17, 2022

Closes GH-50466

Empty polygons have no exterior ring, do not assume they always do

@strk strk force-pushed the fix-crash-on-empty-polygon branch from df3924e to 5281ac1 Compare October 17, 2022 14:51
@strk strk requested a review from elpaso October 17, 2022 14:53
@nyalldawson nyalldawson merged commit aa281d9 into qgis:master Oct 17, 2022
@qgis-bot
Copy link
Collaborator

The backport to release-3_22 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 5281ac1045... Fix crash on empty polygon conversion to curve
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

stdout
Auto-merging tests/src/core/geometry/testqgspolygon.cpp
CONFLICT (content): Merge conflict in tests/src/core/geometry/testqgspolygon.cpp

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-release-3_22 release-3_22
# Navigate to the new working tree
cd .worktrees/backport-release-3_22
# Create a new branch
git switch --create backport-50577-to-release-3_22
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 5281ac10455d9bb2cfd6876f5063956480a83343
# Push it to GitHub
git push --set-upstream origin backport-50577-to-release-3_22
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release-3_22

Then, create a pull request where the base branch is release-3_22 and the compare/head branch is backport-50577-to-release-3_22.

@qgis-bot qgis-bot added the failed backport The automated backport attempt failed, needs a manual backport label Oct 17, 2022
@strk strk deleted the fix-crash-on-empty-polygon branch October 18, 2022 14:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
failed backport The automated backport attempt failed, needs a manual backport
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Crash with offline-editing-core-plugin converting to offline project layer with empty polygon
3 participants