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

Coverity scan fixes #60311

Merged
merged 5 commits into from
Jan 28, 2025
Merged

Coverity scan fixes #60311

merged 5 commits into from
Jan 28, 2025

Conversation

nyalldawson
Copy link
Collaborator

Misc fixes from latest coverity scan results

@github-actions github-actions bot added this to the 3.42.0 milestone Jan 28, 2025
Copy link

github-actions bot commented Jan 28, 2025

🪟 Windows builds

Download Windows builds of this PR for testing.
Debug symbols for this build are available here.
(Built from commit 9b20edd)

🪟 Windows Qt6 builds

Download Windows Qt6 builds of this PR for testing.
(Built from commit 9b20edd)

@nyalldawson nyalldawson merged commit 6b490b0 into qgis:master Jan 28, 2025
39 checks passed
@nyalldawson nyalldawson deleted the coverity branch January 28, 2025 08:03
@qgis-bot
Copy link
Collaborator

The backport to release-3_40 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 9b20edd3383... Add missing reference
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".
hint: Disable this message with "git config set advice.mergeConflict false"

stdout
[backport-60311-to-release-3_40 4dbfc479263] Fix leak in zip utils
 Author: Nyall Dawson <[email protected]>
 Date: Tue Jan 28 14:07:57 2025 +1000
 1 file changed, 3 insertions(+)
Auto-merging src/analysis/processing/qgsalgorithmexportmesh.cpp
[backport-60311-to-release-3_40 0ef78737cb1] Validate inputs for export mesh algorithms
 Author: Nyall Dawson <[email protected]>
 Date: Tue Jan 28 14:27:03 2025 +1000
 1 file changed, 12 insertions(+), 2 deletions(-)
[backport-60311-to-release-3_40 e538db511fe] Avoid potential divide by 0 in layout map items
 Author: Nyall Dawson <[email protected]>
 Date: Tue Jan 28 14:27:29 2025 +1000
 1 file changed, 20 insertions(+), 9 deletions(-)
Auto-merging src/core/geometry/qgsinternalgeometryengine.cpp
[backport-60311-to-release-3_40 454499d34c7] Avoid potential divide by zero
 Author: Nyall Dawson <[email protected]>
 Date: Tue Jan 28 14:27:55 2025 +1000
 1 file changed, 2 insertions(+), 2 deletions(-)
Auto-merging src/gui/vector/qgsattributesformproperties.cpp
CONFLICT (content): Merge conflict in src/gui/vector/qgsattributesformproperties.cpp
Auto-merging src/gui/vector/qgsattributesformproperties.h
CONFLICT (content): Merge conflict in src/gui/vector/qgsattributesformproperties.h

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_40 release-3_40
# Navigate to the new working tree
cd .worktrees/backport-release-3_40
# Create a new branch
git switch --create backport-60311-to-release-3_40
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 408fe8e6312aa565c4ff6b2ffafc24dcc0f78a8e,1192f8785b075d3825ff0b47ec84b58fb508c7db,ac08627bfed1d189ba160d9ccc77d16858c6ec68,203a253f0e37d6d3454ec6898cee034525a33bc6,9b20edd3383839116b50b0e18b2bc2b922ea1d6c
# Push it to GitHub
git push --set-upstream origin backport-60311-to-release-3_40
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release-3_40

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

@qgis-bot qgis-bot added the failed backport The automated backport attempt failed, needs a manual backport label Jan 28, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release-3_40 failed backport The automated backport attempt failed, needs a manual backport
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants