Import egrid

[magnesj]

PR Type

Bug fix, Enhancement

---

Description

• Replace int with offset_type for large file support

• Add overflow checks for buffer size calculations

• Disable simulation well data test

• Update submodule to newer version

---

Diagram Walkthrough

flowchart LR
  A["int size fields"] --> B["offset_type size fields"]
  B --> C["Buffer size calculations"]
  C --> D["Overflow protection"]
  E["Test issues"] --> F["Disabled test"]

Loading

File Walkthrough

	Relevant files
Tests	RifReaderEclipseOutput-Test.cpp Add disabled simulation well data test                                      ApplicationLibCode/UnitTests/RifReaderEclipseOutput-Test.cpp Add include for RifReaderEclipseWell.h Add disabled test for reading simulation well data Test uses RifEclipseUnifiedRestartFileAccess for restart files +33/-0
Enhancement	ecl_kw.cpp Replace int with offset_type for large file support            ThirdParty/Ert/lib/ecl/ecl_kw.cpp Replace int size with offset_type size in struct Update function signatures to use offset_type for indices Add overflow checks in buffer allocation functions Update buffer size calculations to use offset_type +41/-24  ecl_kw.hpp Update header declarations for offset_type usage                  ThirdParty/Ert/lib/include/ert/ecl/ecl_kw.hpp Update function declarations to use offset_type instead of int Change parameter types for index-based functions Update getter and setter function signatures +13/-13  fortio.c Update fortio functions for large file support                      ThirdParty/Ert/lib/ecl/fortio.c Change fortio_init_read return type to offset_type Update fortio_fread_buffer to use offset_type for buffer size Change local variables to use offset_type for large file support +7/-7      fortio.h Update fortio header for offset_type support                          ThirdParty/Ert/lib/include/ert/ecl/fortio.h Update fortio_init_read declaration to return offset_type Change fortio_fread_buffer parameter type to offset_type +2/-2
Dependencies	opm-common Update opm-common submodule version                                            ThirdParty/custom-opm-common/opm-common Update submodule commit from 54c8efcd7e5a028c962162ea0a476bc3fcb98f29 to f5bf4892728824f34741ef1e47e8c45c87b1c4d0 +1/-1

---

[qodo-code-review]

PR Reviewer Guide 🔍

Here are some key observations to aid the review process:

⏱️ Estimated effort to review: 4 🔵🔵🔵🔵⚪

🧪 No relevant tests

🔒 No security concerns identified

⚡ Recommended focus areas for review Overflow Check The overflow check uses SIZE_MAX/2 as threshold which may be too conservative and could reject valid large files. The logic should be reviewed to ensure it properly handles legitimate large file scenarios while preventing actual overflows. // Add this check to catch suspicious values if (buffer_size < 0 || buffer_size > (SIZE_MAX / 2)) { util_abort("%s: suspicious new_size value %zu - possible overflow\n", __func__, buffer_size); } Hardcoded Path The test contains hardcoded file paths that appear to be system-specific and may not exist in other environments. This could cause test failures and should use relative paths or test data directories. // restartFilename = "c:/gitroot/resinsight-tutorials/model-data/drogon/DROGON-0.UNRST"; restartFilename = "f:/Models/equinor_azure/EGRID_Crash_Jun25/SM_TEMP_JFUN_DYN_FMU-0.UNRST"; Type Consistency Mixed usage of offset_type and int types in buffer calculations and comparisons. The index assertion function still uses int format specifiers in error messages while comparing offset_type values, which could cause format string warnings or incorrect output. if (index < 0 || index >= ecl_kw->size) util_abort("%s: Invalid index lookup. kw:%s input_index:%d size:%d \n",caller , ecl_kw->header , index , ecl_kw->size);

[qodo-code-review]

PR Code Suggestions ✨

Explore these optional code suggestions:

Category	Suggestion	Impact
General	Update parameter type consistency This function declaration still uses int for the index parameter while other similar functions have been updated to use offset_type. This inconsistency could lead to type mismatch errors or incorrect behavior when handling large indices. ThirdParty/Ert/lib/include/ert/ecl/ecl_kw.hpp [114] -const char * ecl_kw_iget_string_ptr(const ecl_kw_type *, int); +const char * ecl_kw_iget_string_ptr(const ecl_kw_type *, offset_type); Apply / Chat Suggestion importance[1-10]: 8 __ Why: The suggestion correctly points out that the ecl_kw_iget_string_ptr function declaration was missed during the refactoring from int to offset_type, and fixing this inconsistency is critical for the correctness of the large file support feature.	Medium
Possible issue	Fix format specifier mismatch The format specifier %zu is incorrect for offset_type which may not be size_t. Use a cast to size_t or use the appropriate format specifier for the actual type to prevent undefined behavior in printf-style functions. ThirdParty/Ert/lib/ecl/ecl_kw.cpp [305-308] // Add this check to catch suspicious values if (buffer_size < 0 || buffer_size > (SIZE_MAX / 2)) { - util_abort("%s: suspicious new_size value %zu - possible overflow\n", __func__, buffer_size); + util_abort("%s: suspicious new_size value %zu - possible overflow\n", __func__, (size_t)buffer_size); } Apply / Chat Suggestion importance[1-10]: 7 __ Why: The suggestion correctly identifies a format specifier mismatch in util_abort, as %zu is for size_t while buffer_size is offset_type, which prevents potential undefined behavior in an error path.	Medium
Update