Skip to content

fix: JPEG detection fails on files with trailing data (Motion Photos) #379

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

Open
tetsugakusha256 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: JPEG detection fails on files with trailing data (Motion Photos) #379

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
19 changes: 2 additions & 17 deletions lua/image/utils/magic.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,6 @@ local function read_file_header(file, num_bytes)
return content and { content:byte(1, #content) } or nil
end

local function has_jpeg_end_signature(file)
if not file then return false end
local size = file:seek("end")
if size < 2 then return false end
file:seek("set", size - 2)
local end_signature = file:read(2)
return end_signature == "\xFF\xD9", nil
end

local function check_signature_match(header, format, signature)
local bytes = { signature:byte(1, #signature) }
local match = true
Expand Down Expand Up @@ -70,14 +61,8 @@ M.detect_format = function(path)

for format, signature in pairs(image_signatures) do
if check_signature_match(header, format, signature) then
if format == "jpeg" then
local is_jpeg = has_jpeg_end_signature(file)
file:close()
return is_jpeg and format or nil
else
file:close()
return format
end
file:close()
return format
end
end

Expand Down