balki/pgweb
1
0
Fork 0
Code Pull Requests Activity

api: properly check for errors

Browse Source 
This results in NPE when cl.Info() returns an error.
This commit is contained in:
Tamir Duberstein 2017-04-29 16:56:31 -04:00
parent 6289e479a5
commit c4a33206ce
No known key found for this signature in database
GPG Key ID: 1C1E98CC8E17BB89
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/api/api.go
View File

@ -109,12 +109,12 @@ func Connect(c *gin.Context) {
info, err := cl.Info() info, err := cl.Info()
if err == nil { if err == nil {
err = setClient(c, cl) err = setClient(c, cl)
}
if err != nil { if err != nil {
cl.Close() cl.Close()
c.JSON(400, Error{err.Error()}) c.JSON(400, Error{err.Error()})
return return
} }
}
c.JSON(200, info.Format()[0]) c.JSON(200, info.Format()[0])
} }
@ -163,12 +163,12 @@ func SwitchDb(c *gin.Context) {
info, err := cl.Info() info, err := cl.Info()
if err == nil { if err == nil {
err = setClient(c, cl) err = setClient(c, cl)
}
if err != nil { if err != nil {
cl.Close() cl.Close()
c.JSON(400, Error{err.Error()}) c.JSON(400, Error{err.Error()})
return return
} }
}
conn.Close() conn.Close()