[sr-dev] git:master:25cf75d6: ims_registrar_scscf: Copy AOR for lookup, so unlock udomain properly unlocks the domain. Should fix issue Github #1647

[Carsten Bock]

Module: kamailio
Branch: master
Commit: 25cf75d6a7cc040883ada7bb7988aad0b6dde663
URL: https://github.com/kamailio/kamailio/commit/25cf75d6a7cc040883ada7bb7988aad0b6dde663

Author: Carsten Bock <carsten at ng-voice.com>
Committer: Carsten Bock <carsten at ng-voice.com>
Date: 2018-09-18T10:30:05+02:00

ims_registrar_scscf: Copy AOR for lookup, so unlock udomain properly unlocks the domain. Should fix issue Github #1647

---

Modified: src/modules/ims_registrar_scscf/lookup.c

---

Diff:  https://github.com/kamailio/kamailio/commit/25cf75d6a7cc040883ada7bb7988aad0b6dde663.diff
Patch: https://github.com/kamailio/kamailio/commit/25cf75d6a7cc040883ada7bb7988aad0b6dde663.patch

---

diff --git a/src/modules/ims_registrar_scscf/lookup.c b/src/modules/ims_registrar_scscf/lookup.c
index 5489440208..0e7b06cf60 100644
--- a/src/modules/ims_registrar_scscf/lookup.c
+++ b/src/modules/ims_registrar_scscf/lookup.c
@@ -75,7 +75,7 @@ int lookup(struct sip_msg* _m, udomain_t* _d, char* ue_type_c) {
         LM_ERR("NULL message!!!\n");
         return -1;
     }
-    
+
     switch (ue_type_c[0]) {
             case '3':
                 LM_DBG("looking for 3gpp terminals\n");
@@ -91,8 +91,23 @@ int lookup(struct sip_msg* _m, udomain_t* _d, char* ue_type_c) {
             ue_type=0;
     }
 
-    if (_m->new_uri.s) aor = _m->new_uri;
-    else aor = _m->first_line.u.request.uri;
+    if (_m->new_uri.s) {
+			aor.s = pkg_malloc(_m->new_uri.len);
+			if (aor.s == NULL) {
+				LM_ERR("memory allocation failure\n");
+				return -1;
+			}
+			memcpy(aor.s, _m->new_uri.s, _m->new_uri.len);
+			aor.len = _m->new_uri.len;
+		} else {
+			aor.s = pkg_malloc(_m->first_line.u.request.uri.len);
+			if (aor.s == NULL) {
+				LM_ERR("memory allocation failure\n");
+				return -1;
+			}
+			memcpy(aor.s, _m->first_line.u.request.uri.s, _m->first_line.u.request.uri.len);
+			aor.len = _m->first_line.u.request.uri.len;
+		}
 
     for (i = 4; i < aor.len; i++)
         if (aor.s[i] == ':' || aor.s[i] == ';' || aor.s[i] == '?') {
@@ -108,6 +123,7 @@ int lookup(struct sip_msg* _m, udomain_t* _d, char* ue_type_c) {
     res = ul.get_impurecord(_d, &aor, &r);
     if (res != 0) {
         LM_DBG("'%.*s' Not found in usrloc\n", aor.len, ZSW(aor.s));
+				pkg_free(aor.s);
         ul.unlock_udomain(_d, &aor);
         return -1;
     }
@@ -206,6 +222,7 @@ int lookup(struct sip_msg* _m, udomain_t* _d, char* ue_type_c) {
     }
 
 done:
+		pkg_free(aor.s);
     ul.unlock_udomain(_d, &aor);
     return ret;
 }