[sr-dev] git:master:b1d22743: modules/ims_registrar_scscf: changed order of locking to be consistently ordered

[jaybeepee]

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

Author: jaybeepee <jason.penton at gmail.com>
Committer: jaybeepee <jason.penton at gmail.com>
Date: 2015-05-28T17:47:05+02:00

modules/ims_registrar_scscf: changed order of locking to be consistently ordered

---

Modified: modules/ims_registrar_scscf/registrar_notify.c

---

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

---

diff --git a/modules/ims_registrar_scscf/registrar_notify.c b/modules/ims_registrar_scscf/registrar_notify.c
index ae2d95b..cb57f9c 100644
--- a/modules/ims_registrar_scscf/registrar_notify.c
+++ b/modules/ims_registrar_scscf/registrar_notify.c
@@ -232,8 +232,8 @@ int can_publish_reg(struct sip_msg *msg, char *_t, char *str2) {
 		    LM_DBG("Identity found in SP[%d][%d]\n",
 			    i, j);
 		    ret = CSCF_RETURN_TRUE;
-		    ul.unlock_udomain((udomain_t*) _t, &presentity_uri);
 		    ul.unlock_subscription(r->s);
+		    ul.unlock_udomain((udomain_t*) _t, &presentity_uri);
 		    goto done;
 		}
 	    }
@@ -390,8 +390,8 @@ int can_subscribe_to_reg(struct sip_msg *msg, char *_t, char *str2) {
                     LM_DBG("Identity found in SP[%d][%d]\n",
                             i, j);
                     ret = CSCF_RETURN_TRUE;
+                    ul.unlock_subscription(r->s);
                     ul.unlock_udomain((udomain_t*) _t, &presentity_uri);
-	            ul.unlock_subscription(r->s);
                     goto done;
                 }
             }