Backport improved validation to version 6.3 - #1289
Merged
ajaust merged 3 commits intoSep 7, 2026
Merged
Conversation
ajaust
commented
Sep 4, 2026
Comment on lines
+466
to
+472
| if (rporv_size != active_size) { | ||
| fprintf(stderr, | ||
| "%s: %s keyword has %d elements, but the grid has %d " | ||
| "active cells\n", | ||
| __func__, RPORV_KW, rporv_size, active_size); | ||
| return NULL; | ||
| } |
Collaborator
Author
There was a problem hiding this comment.
Is this reasonable (similar approach as in rd_grav_survey_alloc_FIP) or should we rather fail hard using util_abort?
Collaborator
There was a problem hiding this comment.
I think this is a reasonable approach.
Validate LGR numbers before using them to index lgr_index_map. This prevents negative values from malformed EGRID files being used. Add a regression test covering a negative GRIDHEAD LGR number.
ajaust
force-pushed
the
version-6.3-validation-backport
branch
from
September 4, 2026 08:21
2db4801 to
0c34f7f
Compare
ajaust
marked this pull request as ready for review
September 4, 2026 08:42
eivindjahren
approved these changes
Sep 7, 2026
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
2 participants
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.
Recently improved validation of
lgr_nrandrporvbackported to version 6.3.I need feedback if returning
NULLinstead of usingutil_abortinrd_grav_survey_alloc_RPORVis a good idea. It follows the same pattern (returnNULL) used inrd_grav_survey_alloc_FIP.