averello/koreader-mirror
1
0
Fork 0
mirror of https://github.com/koreader/koreader.git synced 2025-12-13 20:36:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

[fix] PicDocument: Pass a copy of image_bb in getCoverPageImage() (#4628)

Browse Source 
Avoids a use-after-free in mupdf.scaleBlitBuffer

Fix koreader/koreader-base#821

Thanks for the hint, @poire-z ;).

* As @poire-z suggested, the original unscaled bb should probably be free'd.
This commit is contained in:
NiLuJe
2019-02-21 08:59:41 +01:00
committed by Frans de Jonge
parent 8e5c1addf5
commit 6c29b7da65
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/document/picdocument.lua
View File

@@ -43,7 +43,7 @@ end
function PicDocument:getCoverPageImage() function PicDocument:getCoverPageImage()
local first_page = self._document:openPage(1) local first_page = self._document:openPage(1)
if first_page.image_bb then if first_page.image_bb then
return first_page.image_bb return first_page.image_bb:copy()
end end
return nil return nil
end end

2
plugins/coverbrowser.koplugin/bookinfomanager.lua
View File

@@ -438,7 +438,7 @@ function BookInfoManager:extractBookInfo(filepath, cover_specs)
scale_factor = math.min(spec_max_cover_w / cbb_w, spec_max_cover_h / cbb_h) scale_factor = math.min(spec_max_cover_w / cbb_w, spec_max_cover_h / cbb_h)
cbb_w = math.min(math.floor(cbb_w * scale_factor)+1, spec_max_cover_w) cbb_w = math.min(math.floor(cbb_w * scale_factor)+1, spec_max_cover_w)
cbb_h = math.min(math.floor(cbb_h * scale_factor)+1, spec_max_cover_h) cbb_h = math.min(math.floor(cbb_h * scale_factor)+1, spec_max_cover_h)
cover_bb = RenderImage:scaleBlitBuffer(cover_bb, cbb_w, cbb_h) cover_bb = RenderImage:scaleBlitBuffer(cover_bb, cbb_w, cbb_h, true)
end end
dbrow.cover_w = cbb_w dbrow.cover_w = cbb_w
dbrow.cover_h = cbb_h dbrow.cover_h = cbb_h