qgis / QGIS

QGIS is a free, open source, cross platform (lin/win/mac) geographical information system (GIS)
https://qgis.org
GNU General Public License v2.0
10.65k stars 3.01k forks source link

Fix a bunch of coverity scan errors #59515

Closed nyalldawson closed 2 days ago

github-actions[bot] commented 2 days ago

🪟 Windows builds

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

🪟 Windows Qt6 builds

Download Windows Qt6 builds of this PR for testing. (Built from commit 60780fc3afee8dc4eed5a3763c9841eeff6f8b86)

qgis-bot commented 2 days ago

The backport to queued_ltr_backports failed:

The process '/usr/bin/git' failed with exit code 1
stderr ``` error: could not apply 69d09af5bf1... Avoid some unnecessary auto hint: After resolving the conflicts, mark them with hint: "git add/rm ", 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 advice.mergeConflict false" ```
stdout ``` Auto-merging src/3d/qgs3daxis.cpp Auto-merging src/analysis/processing/qgsalgorithmgltftovector.cpp Auto-merging src/core/qgscoordinateutils.cpp Auto-merging src/gui/editorwidgets/qgsrelationreferencewidget.cpp Auto-merging src/gui/layout/qgslayoutelevationprofilewidget.cpp [backport-59515-to-queued_ltr_backports ba1b60fd926] Fix some copy/paste errors identified by coverity scan Author: Nyall Dawson Date: Wed Nov 20 15:31:03 2024 +1000 5 files changed, 5 insertions(+), 5 deletions(-) Auto-merging src/core/qgspathresolver.cpp [backport-59515-to-queued_ltr_backports 4582f07c541] Fix iterator mismatch Author: Nyall Dawson Date: Wed Nov 20 15:45:53 2024 +1000 1 file changed, 4 insertions(+), 4 deletions(-) Auto-merging src/core/raster/qgsrasterattributetable.cpp Auto-merging src/gui/qgsnewvectortabledialog.cpp [backport-59515-to-queued_ltr_backports 7650fa07e1c] Fix same-on-both sides checks Author: Nyall Dawson Date: Wed Nov 20 15:49:03 2024 +1000 2 files changed, 2 insertions(+), 2 deletions(-) Auto-merging src/gui/qgslayermetadataresultsmodel.cpp [backport-59515-to-queued_ltr_backports f06ef4597cb] Fix integer divide Author: Nyall Dawson Date: Wed Nov 20 15:49:10 2024 +1000 1 file changed, 1 insertion(+), 1 deletion(-) Auto-merging src/core/symbology/qgsfillsymbollayer.cpp [backport-59515-to-queued_ltr_backports c7bba01e350] Remove dead code Author: Nyall Dawson Date: Wed Nov 20 15:53:34 2024 +1000 1 file changed, 1 deletion(-) Auto-merging src/core/textrenderer/qgstextbackgroundsettings.cpp [backport-59515-to-queued_ltr_backports d181218044e] Fix comparison Author: Nyall Dawson Date: Wed Nov 20 15:53:42 2024 +1000 1 file changed, 1 insertion(+), 1 deletion(-) CONFLICT (modify/delete): src/core/tiledscene/qgsquantizedmeshdataprovider.cpp deleted in HEAD and modified in 69d09af5bf1 (Avoid some unnecessary auto). Version 69d09af5bf1 (Avoid some unnecessary auto) of src/core/tiledscene/qgsquantizedmeshdataprovider.cpp left in tree. ```

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-queued_ltr_backports queued_ltr_backports
# Navigate to the new working tree
cd .worktrees/backport-queued_ltr_backports
# Create a new branch
git switch --create backport-59515-to-queued_ltr_backports
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick a390b403a5ccfe04ce19c1442e8aa744a0bb58c1,ba07d876f837b103db6866f45ba85e71848d26a7,93bce2ed763fa884c173f2a6150809d467f9c6c3,6ec289d4614e859a33257cd79da592c308844d3f,a6a18a93bc7234480318cb100689e060f4130ba6,f7e1550a6d71cba436d55c88c136b571efed747d,69d09af5bf198f1abba763b4c3a5df87605bd4bf,60780fc3afee8dc4eed5a3763c9841eeff6f8b86
# Push it to GitHub
git push --set-upstream origin backport-59515-to-queued_ltr_backports
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-queued_ltr_backports

Then, create a pull request where the base branch is queued_ltr_backports and the compare/head branch is backport-59515-to-queued_ltr_backports.