Fix util_abort called with too few arguments#1137
Merged
eivindjahren merged 1 commit intomainfrom Apr 17, 2026
Merged
Conversation
There was a problem hiding this comment.
Pull request overview
Fixes format-string argument mismatches in a couple of util_abort() call sites to address CodeQL/security scanning findings (and prevent undefined behavior when aborting).
Changes:
- Add missing
__func__argument toutil_abort()inwell_segment_link_strict(). - Add missing
__func__argument toutil_abort()in two grid keyword copy abort paths.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
lib/resdata/well_segment.cpp |
Fixes %s format specifier mismatch by passing __func__ to util_abort() in strict segment linking failure path. |
lib/resdata/rd_grid.cpp |
Fixes %s format specifier mismatch by passing __func__ to util_abort() in two size-mismatch abort paths. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
ajaust
approved these changes
Apr 16, 2026
ajaust
left a comment
There was a problem hiding this comment.
Looks good.
Should we -Wformat to the default compile options? This might be able to detect such errors at compile time.
Collaborator
Author
|
@ajaust we have -Wall (which gives |
This file contains hidden or 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
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.
Issue
Resolves https://github.com/equinor/resdata/security/code-scanning/9 and two similar security reports