re
/
gorm
forked from mirror/gorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

prevent nil pointer dereference on closed connection

This commit is contained in:
Vladislav Moskovets 2017-03-31 14:26:51 +03:00
parent 45ccb13437
commit 72a60c5df4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
main.go
View File

@ -452,7 +452,7 @@ func (s *DB) Debug() *DB {
// Begin begin a transaction // Begin begin a transaction
func (s *DB) Begin() *DB { func (s *DB) Begin() *DB {
c := s.clone() c := s.clone()
if db, ok := c.db.(sqlDb); ok { if db, ok := c.db.(sqlDb); ok && db != nil {
tx, err := db.Begin() tx, err := db.Begin()
c.db = interface{}(tx).(SQLCommon) c.db = interface{}(tx).(SQLCommon)
c.AddError(err) c.AddError(err)
@ -464,7 +464,7 @@ func (s *DB) Begin() *DB {
// Commit commit a transaction // Commit commit a transaction
func (s *DB) Commit() *DB { func (s *DB) Commit() *DB {
if db, ok := s.db.(sqlTx); ok { if db, ok := s.db.(sqlTx); ok && db != nil {
s.AddError(db.Commit()) s.AddError(db.Commit())
} else { } else {
s.AddError(ErrInvalidTransaction) s.AddError(ErrInvalidTransaction)
@ -474,7 +474,7 @@ func (s *DB) Commit() *DB {
// Rollback rollback a transaction // Rollback rollback a transaction
func (s *DB) Rollback() *DB { func (s *DB) Rollback() *DB {
if db, ok := s.db.(sqlTx); ok { if db, ok := s.db.(sqlTx); ok && db != nil {
s.AddError(db.Rollback()) s.AddError(db.Rollback())
} else { } else {
s.AddError(ErrInvalidTransaction) s.AddError(ErrInvalidTransaction)