GOMODULES/fiber
1
0
Fork 0
mirror of https://github.com/gofiber/fiber.git synced 2025-05-31 11:52:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

🐛 fix: even error we gonna to unlock it, else it will went deadlock (#1248)

Browse Source
This commit is contained in:
SianLoong 2021-03-31 05:40:09 +08:00 committed by GitHub
parent ca0e784fb9
commit c71da35ddb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
middleware/session/session.go
View File

@ -142,12 +142,12 @@ func (s *Session) Save() error {
// Convert data to bytes // Convert data to bytes
mux.Lock() mux.Lock()
defer mux.Unlock()
encCache := gob.NewEncoder(s.byteBuffer) encCache := gob.NewEncoder(s.byteBuffer)
err := encCache.Encode(&s.data.Data) err := encCache.Encode(&s.data.Data)
if err != nil { if err != nil {
return err return err
} }
mux.Unlock()
// pass raw bytes with session id to provider // pass raw bytes with session id to provider
if err := s.config.Storage.Set(s.id, s.byteBuffer.Bytes(), s.config.Expiration); err != nil { if err := s.config.Storage.Set(s.id, s.byteBuffer.Bytes(), s.config.Expiration); err != nil {

4
middleware/session/store.go
View File

@ -70,13 +70,13 @@ func (s *Store) Get(c *fiber.Ctx) (*Session, error) {
// Unmashal if we found data // Unmashal if we found data
if raw != nil && err == nil { if raw != nil && err == nil {
mux.Lock() mux.Lock()
defer mux.Unlock()
_, _ = sess.byteBuffer.Write(raw) _, _ = sess.byteBuffer.Write(raw)
encCache := gob.NewDecoder(sess.byteBuffer) encCache := gob.NewDecoder(sess.byteBuffer)
err := encCache.Decode(&sess.data.Data) err := encCache.Decode(&sess.data.Data)
if err != nil { if err != nil {
return nil, err return nil, err
} }
mux.Unlock()
} else if err != nil { } else if err != nil {
return nil, err return nil, err
} else { } else {
@ -95,6 +95,7 @@ func (s *Store) responseCookies(c *fiber.Ctx) (string, error) {
} }
cookie := fasthttp.AcquireCookie() cookie := fasthttp.AcquireCookie()
defer fasthttp.ReleaseCookie(cookie)
err := cookie.ParseBytes(cookieValue) err := cookie.ParseBytes(cookieValue)
if err != nil { if err != nil {
return "", err return "", err
@ -103,7 +104,6 @@ func (s *Store) responseCookies(c *fiber.Ctx) (string, error) {
value := make([]byte, len(cookie.Value())) value := make([]byte, len(cookie.Value()))
copy(value, cookie.Value()) copy(value, cookie.Value())
id := utils.UnsafeString(value) id := utils.UnsafeString(value)
fasthttp.ReleaseCookie(cookie)
return id, nil return id, nil
} }