tileradotorg/mautrix-whatsapp
1
0
Fork 0
forked from MirrorHub/mautrix-whatsapp
Code Pull requests Activity

Use native webp for decoding

Browse source 
Fixes #650
Fixes GHSA-w665-m639-6c38
This commit is contained in:
Tulir Asokan 2023-09-18 10:00:35 -04:00
parent ca4b46257c
commit 6c4411c666
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
portal.go
View file

@ -41,7 +41,7 @@ import (
"sync" "sync"
"time" "time"
"github.com/chai2010/webp" cwebp "github.com/chai2010/webp"
"github.com/rs/zerolog" "github.com/rs/zerolog"
"github.com/tidwall/gjson" "github.com/tidwall/gjson"
"go.mau.fi/util/dbutil" "go.mau.fi/util/dbutil"
@ -57,6 +57,7 @@ import (
"go.mau.fi/whatsmeow/types/events" "go.mau.fi/whatsmeow/types/events"
"golang.org/x/exp/slices" "golang.org/x/exp/slices"
"golang.org/x/image/draw" "golang.org/x/image/draw"
"golang.org/x/image/webp"
"google.golang.org/protobuf/proto" "google.golang.org/protobuf/proto"
log "maunium.net/go/maulogger/v2" log "maunium.net/go/maulogger/v2"
"maunium.net/go/mautrix" "maunium.net/go/mautrix"
@ -3621,7 +3622,7 @@ func (portal *Portal) convertToWebP(img []byte) ([]byte, error) {
} }
var webpBuffer bytes.Buffer var webpBuffer bytes.Buffer
if err = webp.Encode(&webpBuffer, decodedImg, nil); err != nil { if err = cwebp.Encode(&webpBuffer, decodedImg, nil); err != nil {
return img, fmt.Errorf("failed to encode webp image: %w", err) return img, fmt.Errorf("failed to encode webp image: %w", err)
} }