[sr-dev] git:master:9c793758: Merge pull request #1623 from lasseo/pua_reginfo_crashfix

[GitHub]

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

Author: Daniel-Constantin Mierla <miconda at gmail.com>
Committer: GitHub <noreply at github.com>
Date: 2018-08-22T11:00:05+02:00

Merge pull request #1623 from lasseo/pua_reginfo_crashfix

pua_reginfo: fix crash and issue during load

---

Modified: src/modules/pua_reginfo/notify.c

---

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

---

diff --git a/src/modules/pua_reginfo/notify.c b/src/modules/pua_reginfo/notify.c
index 754a2ed099..ea50f2db65 100644
--- a/src/modules/pua_reginfo/notify.c
+++ b/src/modules/pua_reginfo/notify.c
@@ -111,7 +111,7 @@ int process_contact(udomain_t * domain, urecord_t ** ul_record, str aor, str cal
 	ci.expires = time(0) + expires;
 
 	/* set ruid */
-	if(sruid_next(&_reginfo_sruid) < 0) {
+	if(sruid_next_safe(&_reginfo_sruid) < 0) {
 		LM_ERR("failed to generate ruid");
 	} else {
 		ci.ruid = _reginfo_sruid.uid;
@@ -306,9 +306,15 @@ int process_body(str notify_body, udomain_t * domain) {
 					}
 					ul_contact = ul_contact->next;
 				}
+				
 				if (ul.delete_urecord(domain, &aor_key, ul_record) < 0) {
 					LM_ERR("failed to remove record from usrloc\n");
-				}
+				} 
+
+				/* Record deleted, and should not be used anymore */
+				ul_record = NULL;
+				
+				
 				/* If already a registration with contacts was found, then keep that result.
 				   otherwise the result is now "No contacts found" */
 				if (final_result != RESULT_CONTACTS_FOUND) final_result = RESULT_NO_CONTACTS;