fix: always seek to the beginning of the ioproxy during open for DDS …

…and PSD files (#4048) During certain creation tasks, open may be called twice on the ImageInput. If the first open call moves the ioproxy forward, then the second call to open may fail. DDS and PSD were affected so they've been fixed to mirror what other formats (png, hdr, tga, etc.) do by always explicitly seeking to position 0. Fixes #4043 Signed-off-by: Jesse Yurkovich <[email protected]>
AcademySoftwareFoundation · Nov 3, 2023 · f4e7ac1 · f4e7ac1
1 parent 8450736
commit f4e7ac1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/src/dds.imageio/ddsinput.cpp b/src/dds.imageio/ddsinput.cpp
@@ -357,6 +357,7 @@ DDSInput::open(const std::string& name, ImageSpec& newspec)
 
     if (!ioproxy_use_or_open(name))
         return false;
+    ioseek(0);
 
     static_assert(sizeof(dds_header) == 128, "dds header size does not match");
     if (!ioread(&m_dds, sizeof(m_dds), 1))

diff --git a/src/psd.imageio/psdinput.cpp b/src/psd.imageio/psdinput.cpp
@@ -546,6 +546,7 @@ PSDInput::open(const std::string& name, ImageSpec& newspec)
     m_filename = name;
     if (!ioproxy_use_or_open(name))
         return false;
+    ioseek(0);
 
     // File Header
     if (!load_header()) {