Use sync.RWMutex

session/bool.go

@@ -2,6 +2,8 @@ package session
 
 // IsSetBool to check if variable exists
 func (s *Session) IsSetBool(name string) bool {
+	s.varlist.RLock()
+	defer s.varlist.RUnlock()
 	if _, ok := s.varlist.Bool[name]; ok {
 		return true
 	} else {
@@ -11,6 +13,8 @@ func (s *Session) IsSetBool(name string) bool {
 
 // GetBool returns stored variable value or default
 func (s *Session) GetBool(name string, def bool) bool {
+	s.varlist.RLock()
+	defer s.varlist.RUnlock()
 	if v, ok := s.varlist.Bool[name]; ok {
 		return v
 	} else {
@@ -21,6 +25,8 @@ func (s *Session) GetBool(name string, def bool) bool {
 // SetBool to set variable value
 func (s *Session) SetBool(name string, value bool) {
 	isset := s.IsSetBool(name)
+	s.varlist.Lock()
+	defer s.varlist.Unlock()
 	s.varlist.Bool[name] = value
 	if isset || value {
 		s.changed = true
@@ -30,6 +36,8 @@ func (s *Session) SetBool(name string, value bool) {
 // DelBool to remove variable
 func (s *Session) DelBool(name string) {
 	if s.IsSetBool(name) {
+		s.varlist.Lock()
+		defer s.varlist.Unlock()
 		delete(s.varlist.Bool, name)
 		s.changed = true
 	}

session/int.go

@@ -2,6 +2,8 @@ package session
 
 // IsSetInt to check if variable exists
 func (s *Session) IsSetInt(name string) bool {
+	s.varlist.RLock()
+	defer s.varlist.RUnlock()
 	if _, ok := s.varlist.Int[name]; ok {
 		return true
 	} else {
@@ -11,6 +13,8 @@ func (s *Session) IsSetInt(name string) bool {
 
 // GetInt returns stored variable value or default
 func (s *Session) GetInt(name string, def int) int {
+	s.varlist.RLock()
+	defer s.varlist.RUnlock()
 	if v, ok := s.varlist.Int[name]; ok {
 		return v
 	} else {
@@ -21,6 +25,8 @@ func (s *Session) GetInt(name string, def int) int {
 // SetInt to set variable value
 func (s *Session) SetInt(name string, value int) {
 	isset := s.IsSetInt(name)
+	s.varlist.Lock()
+	defer s.varlist.Unlock()
 	s.varlist.Int[name] = value
 	if isset || value != 0 {
 		s.changed = true
@@ -30,6 +36,8 @@ func (s *Session) SetInt(name string, value int) {
 // DelInt to remove variable
 func (s *Session) DelInt(name string) {
 	if s.IsSetInt(name) {
+		s.varlist.Lock()
+		defer s.varlist.Unlock()
 		delete(s.varlist.Int, name)
 		s.changed = true
 	}

session/int64.go

@@ -2,6 +2,8 @@ package session
 
 // IsSetInt64 to check if variable exists
 func (s *Session) IsSetInt64(name string) bool {
+	s.varlist.RLock()
+	defer s.varlist.RUnlock()
 	if _, ok := s.varlist.Int64[name]; ok {
 		return true
 	} else {
@@ -11,6 +13,8 @@ func (s *Session) IsSetInt64(name string) bool {
 
 // GetInt64 returns stored variable value or default
 func (s *Session) GetInt64(name string, def int64) int64 {
+	s.varlist.RLock()
+	defer s.varlist.RUnlock()
 	if v, ok := s.varlist.Int64[name]; ok {
 		return v
 	} else {
@@ -21,6 +25,8 @@ func (s *Session) GetInt64(name string, def int64) int64 {
 // SetInt64 to set variable value
 func (s *Session) SetInt64(name string, value int64) {
 	isset := s.IsSetInt64(name)
+	s.varlist.Lock()
+	defer s.varlist.Unlock()
 	s.varlist.Int64[name] = value
 	if isset || value != 0 {
 		s.changed = true
@@ -30,6 +36,8 @@ func (s *Session) SetInt64(name string, value int64) {
 // DelInt64 to remove variable
 func (s *Session) DelInt64(name string) {
 	if s.IsSetInt64(name) {
+		s.varlist.Lock()
+		defer s.varlist.Unlock()
 		delete(s.varlist.Int64, name)
 		s.changed = true
 	}

session/session.go

@@ -8,11 +8,13 @@ import (
 	"net/http"
 	"os"
 	"strings"
+	"sync"
 	"time"
 )
 
 // vars in memory storage for session variables
 type vars struct {
+	sync.RWMutex
 	Bool   map[string]bool
 	Int    map[string]int
 	Int64  map[string]int64
@@ -46,6 +48,9 @@ func New(w http.ResponseWriter, r *http.Request, tmpdir string) (*Session, error
 		hash:    "",
 	}
 
+	s.varlist.Lock()
+	defer s.varlist.Unlock()
+
 	cookie, err := r.Cookie("session")
 	if err == nil && len(cookie.Value) == 40 {
 		// Load from file
@@ -109,6 +114,9 @@ func (s *Session) Close() bool {
 		return false
 	}
 
+	s.varlist.Lock()
+	defer s.varlist.Unlock()
+
 	r, err := json.Marshal(s.varlist)
 	if err == nil {
 		f, err := os.Create(strings.Join([]string{s.tmpdir, s.hash}, string(os.PathSeparator)))

session/string.go

@@ -2,6 +2,8 @@ package session
 
 // IsSetString to check if variable exists
 func (s *Session) IsSetString(name string) bool {
+	s.varlist.RLock()
+	defer s.varlist.RUnlock()
 	if _, ok := s.varlist.String[name]; ok {
 		return true
 	} else {
@@ -11,6 +13,8 @@ func (s *Session) IsSetString(name string) bool {
 
 // GetString returns stored variable value or default
 func (s *Session) GetString(name string, def string) string {
+	s.varlist.RLock()
+	defer s.varlist.RUnlock()
 	if v, ok := s.varlist.String[name]; ok {
 		return v
 	} else {
@@ -21,6 +25,8 @@ func (s *Session) GetString(name string, def string) string {
 // SetString to set variable value
 func (s *Session) SetString(name string, value string) {
 	isset := s.IsSetString(name)
+	s.varlist.Lock()
+	defer s.varlist.Unlock()
 	s.varlist.String[name] = value
 	if isset || value != "" {
 		s.changed = true
@@ -30,6 +36,8 @@ func (s *Session) SetString(name string, value string) {
 // DelString to remove variable
 func (s *Session) DelString(name string) {
 	if s.IsSetString(name) {
+		s.varlist.Lock()
+		defer s.varlist.Unlock()
 		delete(s.varlist.String, name)
 		s.changed = true
 	}