Skip to content

fix: add recover fix panic on call to method #333

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zhaolunxiang123 wants to merge 2 commits into
base: master
Choose a base branch
from
+12 −1
Open

fix: add recover fix panic on call to method #333

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b70e29
fix: add recover fix export method panic
zhaolunxiang123 Aug 29, 2022
14d9020
fix: add server err reply client
zhaolunxiang123 Sep 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion export.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@ package dbus
import (
"errors"
"fmt"
"log"
"os"
"reflect"
"runtime/debug"
"strings"
)

Expand All @@ -25,6 +27,10 @@ var (
"org.freedesktop.DBus.Error.UnknownInterface",
[]interface{}{"Object does not implement the interface"},
}
ErrMsgServerErrInterface = Error{
"org.freedesktop.DBus.Error.ServerErrInterface",
[]interface{}{"Server Err method"},
}
)

func MakeNoObjectError(path ObjectPath) Error {
Expand Down Expand Up @@ -150,7 +156,12 @@ func (conn *Conn) handleCall(msg *Message) {
ifaceName, _ := msg.Headers[FieldInterface].value.(string)
sender, hasSender := msg.Headers[FieldSender].value.(string)
serial := msg.serial

defer func() {
if r := recover(); r != nil {
log.Printf("err:%v,stack:%s", r, string(debug.Stack()))
conn.sendError(ErrMsgServerErrInterface, sender, serial)
}
}()
if len(name) == 0 {
conn.sendError(ErrMsgUnknownMethod, sender, serial)
}
Expand Down