OpenFileGDB: be robust to unusual .gdbindexes files with weird/corrupted/not-understood entries #11372
Conversation
This file contains 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
…ed/not-understood entries Fixes OSGeo#11295
rouault
changed the title
rouault
added
the
funded through GSP
elpaso
reviewed
Dec 2, 2024
| @@ -2547,7 +2548,7 @@ int FileGDBTable::GetIndexCount() | |||
| returnErrorAndCleanupIf(static_cast<GUInt32>(pabyEnd - pabyCur) < | |||
| sizeof(GUInt32), | |||
| VSIFree(pabyIdx)); | |||
| GUInt32 nIdxNameCarCount = GetUInt32(pabyCur, 0); | |||
| const GUInt32 nIdxNameCarCount = GetUInt32(pabyCur, 0); | |||
There was a problem hiding this comment.
Was Car actually meant to be Char ?
| @@ -2557,13 +2558,56 @@ int FileGDBTable::GetIndexCount() | |||
| ReadUTF16String(pabyCur, nIdxNameCarCount)); | |||
| pabyCur += 2 * nIdxNameCarCount; | |||
|
|
|||
| // 4 "magic fields" | |||
| returnErrorAndCleanupIf(static_cast<GUInt32>(pabyEnd - pabyCur) < | |||
There was a problem hiding this comment.
I do not follow: if the comparison is between a sum of size_t (that I assume to be size_t itself) why cast to GUInt32 ?
rouault
added a commit
to rouault/gdal
that referenced
this pull request
Dec 2, 2024
as suggested by @elpaso in OSGeo#11372 (review)
This was referenced Dec 2, 2024
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.
Fixes #11295