Fix crash on start when file-upload is disabled
When started without specifying a fileupload backend, soju crashes because of a nil-pointer deref. panic: runtime error: invalid memory address or nil pointer dereference [signal SIGSEGV: segmentation violation code=0x1 addr=0x8 pc=0x9484bd] goroutine 1 [running]: main.loadConfig() git.sr.ht/~emersion/soju/cmd/soju/main.go:94 +0x51d main.main() git.sr.ht/~emersion/soju/cmd/soju/main.go:127 +0x165 panic: runtime error: invalid memory address or nil pointer dereference Add a guardclause preventing that crash. Signed-off-by: Moritz Poldrack <git@moritz.sh>
This commit is contained in:
parent
c1fc2f1e61
commit
3b1cf73165
|
@ -91,7 +91,7 @@ func loadConfig() (*config.Server, *soju.Config, error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
var fileUploader fileupload.Uploader
|
var fileUploader fileupload.Uploader
|
||||||
if raw.FileUpload.Driver != "" {
|
if raw.FileUpload != nil {
|
||||||
fileUploader, err = fileupload.New(raw.FileUpload.Driver, raw.FileUpload.Source)
|
fileUploader, err = fileupload.New(raw.FileUpload.Driver, raw.FileUpload.Source)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, nil, fmt.Errorf("failed to create file uploader: %v", err)
|
return nil, nil, fmt.Errorf("failed to create file uploader: %v", err)
|
||||||
|
|
Loading…
Reference in a new issue