From 187a2005a60832be01dce72c1c8551a289563b38 Mon Sep 17 00:00:00 2001 From: ellermister Date: Thu, 11 Mar 2021 15:07:14 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=8E=B7=E5=8F=96exif=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=97=B6=E5=86=85=E5=AD=98=E6=8C=87=E9=92=88=E9=94=99=E8=AF=AF?= =?UTF-8?q?(invalid=20memory=20address=20or=20nil=20pointer=20dereference)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/filesystem/image.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkg/filesystem/image.go b/pkg/filesystem/image.go index 7c5cbf11..fdc9eea0 100644 --- a/pkg/filesystem/image.go +++ b/pkg/filesystem/image.go @@ -89,8 +89,13 @@ func (fs *FileSystem) GenerateThumbnail(ctx context.Context, file *model.File) { file.PicInfo = fmt.Sprintf("%d,%d", w, h) } - // 更新文件的图像信息 + // 更新文件的图像 exif 信息 开始 // 记录文件句柄位置并还原, 获取 exif 信息 + defer func() { + if err := recover(); err != nil{ + util.Log().Warning("照片解析EXIF失败：%s", err) + } + }() currentPosition, err := source.Seek(0, 1) source.Seek(0,0) x, err := exif.Decode(source) @@ -121,6 +126,7 @@ func (fs *FileSystem) GenerateThumbnail(ctx context.Context, file *model.File) { } } } + // 更新文件的图像 exif 信息 结束 // 失败时删除缩略图文件