Skip to content

Commit

Permalink
fix: uploadLocalImage SIGSEGV (#1392)
Browse files Browse the repository at this point in the history
* fix: uploadLocalImage SIGSEGV

* fix: removeLocalElement nil ptr
  • Loading branch information
fumiama committed Feb 24, 2022
1 parent d4c2b62 commit 6687d22
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions coolq/bot.go
Expand Up @@ -146,7 +146,7 @@ func (w *worker) wait() {
}

// uploadLocalImage 上传本地图片
func (bot *CQBot) uploadLocalImage(target message.Source, img *LocalImageElement) (i message.IMessageElement, err error) {
func (bot *CQBot) uploadLocalImage(target message.Source, img *LocalImageElement) (message.IMessageElement, error) {
if img.File != "" {
f, err := os.Open(img.File)
if err != nil {
Expand All @@ -158,15 +158,18 @@ func (bot *CQBot) uploadLocalImage(target message.Source, img *LocalImageElement
if lawful, mime := base.IsLawfulImage(img.Stream); !lawful {
return nil, errors.New("image type error: " + mime)
}
i, err = bot.Client.UploadImage(target, img.Stream, 4)
i, err := bot.Client.UploadImage(target, img.Stream, 4)
if err != nil {
return nil, err
}
switch i := i.(type) {
case *message.GroupImageElement:
i.Flash = img.Flash
i.EffectID = img.EffectID
case *message.FriendImageElement:
i.Flash = img.Flash
}
return
return i, err
}

// uploadLocalVideo 上传本地短视频至群聊
Expand All @@ -185,6 +188,7 @@ func removeLocalElement(elements []message.IMessageElement) []message.IMessageEl
switch e.(type) {
case *LocalImageElement, *LocalVideoElement:
case *message.VoiceElement: // 未上传的语音消息, 也删除
case nil:
default:
if j < i {
elements[j] = e
Expand Down

0 comments on commit 6687d22

Please sign in to comment.