mirror/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2025-08-21 21:35:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

resources/image: Fix nilpointer for images with no Exif

Browse Source 
E.g. PNG files.

Fixes #7688
This commit is contained in:
Bjørn Erik Pedersen
2020-09-14 17:19:30 +02:00
parent 214afe4c1b
commit cd00f7f966
4 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
resources/image.go
View File

@@ -71,11 +71,11 @@ type imageMeta struct {
Exif *exif.Exif
}
func (i *imageResource) Exif() (*exif.Exif, error) {
func (i *imageResource) Exif() *exif.Exif {
return i.root.getExif()
}
func (i *imageResource) getExif() (*exif.Exif, error) {
func (i *imageResource) getExif() *exif.Exif {
i.metaInit.Do(func() {
@@ -131,10 +131,14 @@ func (i *imageResource) getExif() (*exif.Exif, error) {
})
if i.metaInitErr != nil {
return nil, i.metaInitErr
panic(fmt.Sprintf("metadata init failed: %s", i.metaInitErr))
}
return i.meta.Exif, nil
if i.meta == nil {
return nil
}
return i.meta.Exif
}
func (i *imageResource) Clone() resource.Resource {