[sr-dev] git:master:51829652: dmq_usrloc: safety checks for sock field
Daniel-Constantin Mierla
miconda at gmail.com
Sun Sep 18 20:11:10 CEST 2022
Module: kamailio
Branch: master
Commit: 518296523db0c1735c3234d77d6af312f5c9babb
URL: https://github.com/kamailio/kamailio/commit/518296523db0c1735c3234d77d6af312f5c9babb
Author: Daniel-Constantin Mierla <miconda at gmail.com>
Committer: Daniel-Constantin Mierla <miconda at gmail.com>
Date: 2022-09-18T20:09:53+02:00
dmq_usrloc: safety checks for sock field
- GH #3243
---
Modified: src/modules/dmq_usrloc/usrloc_sync.c
---
Diff: https://github.com/kamailio/kamailio/commit/518296523db0c1735c3234d77d6af312f5c9babb.diff
Patch: https://github.com/kamailio/kamailio/commit/518296523db0c1735c3234d77d6af312f5c9babb.patch
---
diff --git a/src/modules/dmq_usrloc/usrloc_sync.c b/src/modules/dmq_usrloc/usrloc_sync.c
index 728c3c53cbf..0d6457d7e2d 100644
--- a/src/modules/dmq_usrloc/usrloc_sync.c
+++ b/src/modules/dmq_usrloc/usrloc_sync.c
@@ -681,7 +681,7 @@ int usrloc_dmq_send_multi_contact(ucontact_t* ptr, str aor, int action, dmq_node
jdoc_contact_group.size += ptr->c.len;
srjson_AddStrToObject(jdoc, jdoc_contact, "received", ptr->received.s, ptr->received.len);
jdoc_contact_group.size += ptr->received.len;
- if (_dmq_usrloc_replicate_socket_info==1) {
+ if (_dmq_usrloc_replicate_socket_info==1 && ptr->sock!=NULL && ptr->sock->sock_str.s!=NULL) {
srjson_AddStrToObject(jdoc, jdoc_contact, "sock", ptr->sock->sock_str.s, ptr->sock->sock_str.len);
jdoc_contact_group.size += ptr->sock->sock_str.len;
}
@@ -709,8 +709,8 @@ int usrloc_dmq_send_multi_contact(ucontact_t* ptr, str aor, int action, dmq_node
jdoc_contact_group.size += snprintf(NULL,0,"%u", ptr->methods);
srjson_AddNumberToObject(jdoc, jdoc_contact, "reg_id", ptr->reg_id);
jdoc_contact_group.size += snprintf(NULL,0,"%d", ptr->reg_id);
- srjson_AddNumberToObject(jdoc, jdoc_contact, "server_id", ptr->server_id);
- jdoc_contact_group.size += snprintf(NULL,0,"%d", ptr->server_id);
+ srjson_AddNumberToObject(jdoc, jdoc_contact, "server_id", ptr->server_id);
+ jdoc_contact_group.size += snprintf(NULL,0,"%d", ptr->server_id);
char idx[5];
jdoc_contact_group.count++;
More information about the sr-dev
mailing list