Skip to content

webp: Improve valid_file to check the header for magic words (5266) #5273

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

Closed
lgritz wants to merge 1 commit into from
+15 −3
Closed

webp: Improve valid_file to check the header for magic words (5266) #5273

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 15 additions & 3 deletions src/webp.imageio/webpinput.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,15 @@ OIIO_PLUGIN_NAMESPACE_BEGIN
namespace webp_pvt {


// Layout of the start of any webp file
struct WebpHead {
char RIFF[4]; // should contain "RIFF"
uint32_t file_size;
char WEBP[4]; // should contain "WEBP"
};



static bool
webp_exif_payload_has_tiff_header(cspan<uint8_t> exif)
{
Expand Down Expand Up @@ -99,9 +108,12 @@ WebpInput::valid_file(Filesystem::IOProxy* ioproxy) const
if (!ioproxy || ioproxy->mode() != Filesystem::IOProxy::Mode::Read)
return false;

uint8_t header[64] {};
const size_t numRead = ioproxy->pread(header, sizeof(header), 0);
return WebPGetInfo(header, numRead, nullptr, nullptr);
WebpHead head;
return ioproxy->pread(&head, sizeof(head), 0) == sizeof(head)
&& head.RIFF[0] == 'R' && head.RIFF[1] == 'I' //
&& head.RIFF[2] == 'F' && head.RIFF[3] == 'F' //
&& head.WEBP[0] == 'W' && head.WEBP[1] == 'E' //
&& head.WEBP[2] == 'B' && head.WEBP[3] == 'P';
}


Expand Down
Loading