Commit 03bd7fbc authored by Vincent Castellano's avatar Vincent Castellano

Added error handling to failed calls to get peer.

parent faec9c92
...@@ -588,7 +588,14 @@ tgl_Msg_getsrc (tgl_Msg *self, void *closure) ...@@ -588,7 +588,14 @@ tgl_Msg_getsrc (tgl_Msg *self, void *closure)
PyObject *ret; PyObject *ret;
if(tgl_get_peer_type (self->msg->from_id)) { if(tgl_get_peer_type (self->msg->from_id)) {
ret = tgl_Peer_FromTglPeer(tgl_peer_get (TLS, self->msg->from_id)); tgl_peer_t *peer = tgl_peer_get (TLS, self->msg->from_id);
if(peer)
ret = tgl_Peer_FromTglPeer(peer);
else {
PyErr_SetString(PeerError, "Cannot Retrieve Peer. Internal tgl error");
Py_RETURN_NONE;
}
} else { } else {
Py_RETURN_NONE; Py_RETURN_NONE;
} }
...@@ -603,7 +610,13 @@ tgl_Msg_getdest (tgl_Msg *self, void *closure) ...@@ -603,7 +610,13 @@ tgl_Msg_getdest (tgl_Msg *self, void *closure)
PyObject *ret; PyObject *ret;
if(tgl_get_peer_type (self->msg->to_id)) { if(tgl_get_peer_type (self->msg->to_id)) {
ret = tgl_Peer_FromTglPeer(tgl_peer_get (TLS, self->msg->to_id)); tgl_peer_t *peer = tgl_peer_get (TLS, self->msg->to_id);
if(peer)
ret = tgl_Peer_FromTglPeer(peer);
else {
PyErr_SetString(PeerError, "Cannot Retrieve Peer. Internal tgl error");
Py_RETURN_NONE;
}
} else { } else {
Py_RETURN_NONE; Py_RETURN_NONE;
} }
...@@ -709,7 +722,13 @@ tgl_Msg_getfwd_src (tgl_Msg *self, void *closure) ...@@ -709,7 +722,13 @@ tgl_Msg_getfwd_src (tgl_Msg *self, void *closure)
PyObject *ret; PyObject *ret;
if(tgl_get_peer_type (self->msg->fwd_from_id)) { if(tgl_get_peer_type (self->msg->fwd_from_id)) {
ret = tgl_Peer_FromTglPeer(tgl_peer_get (TLS, self->msg->fwd_from_id)); tgl_peer_t *peer = tgl_peer_get (TLS, self->msg->fwd_from_id);
if(peer)
ret = tgl_Peer_FromTglPeer(peer);
else {
PyErr_SetString(PeerError, "Cannot Retrieve Peer. Internal tgl error");
Py_RETURN_NONE;
}
} else { } else {
Py_RETURN_NONE; Py_RETURN_NONE;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment