Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from OSGeo:master #154

Merged
merged 4 commits into from
Jan 15, 2025
Merged

[pull] master from OSGeo:master #154

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c2ebecb
VRTDataset::OpenVRTProtocol(): avoid unlikely nullptr deref (CID 1589…
rouault Jan 14, 2025
c7e2b4f
internal libtiff: resync with upstream
rouault Jan 14, 2025
a296b0e
conda-master builds: add muparser dependency
rouault Jan 15, 2025
f138693
port/CMakeLists.txt: remove obsolete test CMake >= 3.16
rouault Jan 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
internal libtiff: resync with upstream
@rouault
rouault committed Jan 14, 2025
commit c7e2b4f1617d0ddff145fc4f03aad06b25bc1cf8
2 changes: 1 addition & 1 deletion frmts/gtiff/libtiff/tif_dir.c
View file
Original file line number Diff line number Diff line change
@@ -2207,7 +2207,7 @@ int TIFFSetSubDirectory(TIFF *tif, uint64_t diroff)
_TIFFCleanupIFDOffsetAndNumberMaps(tif);
tif->tif_curdir = 0; /* first directory of new chain */
/* add this offset to new IFD list */
_TIFFCheckDirNumberAndOffset(tif, tif->tif_curdir, diroff);
retval = _TIFFCheckDirNumberAndOffset(tif, tif->tif_curdir, diroff);
}
/* To be able to return from SubIFD or custom-IFD to main-IFD */
tif->tif_setdirectory_force_absolute = TRUE;