From 451b19597c5436ba481a49ecc89cc113829a9425 Mon Sep 17 00:00:00 2001
From: Daniel-Constantin Mierla <miconda@gmail.com>
Date: Fri, 27 May 2016 11:39:09 +0200
Subject: [PATCH] uac: proper skip of uacreg records with empty attributes

---
 modules/uac/uac_reg.c | 80 +++++++++++++++++++++++--------------------
 1 file changed, 42 insertions(+), 38 deletions(-)

diff --git a/modules/uac/uac_reg.c b/modules/uac/uac_reg.c
index 41b03ac647f..e2226e84df4 100644
--- a/modules/uac/uac_reg.c
+++ b/modules/uac/uac_reg.c
@@ -1089,7 +1089,7 @@ void uac_reg_timer(unsigned int ticks)
 		if(reg.attr.len == 0) { \
 			LM_ERR("empty value not allowed for column[%d]='%.*s' - ignoring record\n", \
 					pos, db_cols[pos]->len, db_cols[pos]->s); \
-			continue; \
+			goto nextrec; \
 		} \
 	} \
 } while(0);
@@ -1188,7 +1188,7 @@ int uac_reg_load_db(void)
 	do {
 		for(i=0; i<RES_ROW_N(db_res); i++)
 		{
-			memset(&reg, 0, sizeof(reg_uac_t));;
+			memset(&reg, 0, sizeof(reg_uac_t));
 			/* check for NULL values ?!?! */
 			reg_db_set_attr(l_uuid, 0);
 			reg_db_set_attr(l_username, 1);
@@ -1215,6 +1215,8 @@ int uac_reg_load_db(void)
 				LM_ERR("Error adding reg to htable\n");
 				goto error;
 			}
+nextrec:
+			;
 		}
 		if (DB_CAPABILITY(reg_dbf, DB_CAP_FETCH)) {
 			if(reg_dbf.fetch_result(reg_db_con, &db_res, reg_fetch_rows)<0) {
@@ -1322,46 +1324,48 @@ int uac_reg_db_refresh(str *pl_uuid)
 
 	memset(&reg, 0, sizeof(reg_uac_t));
 	/* only one record - use FOR to catch 'contunue' on invalid set attr */
-	for(i=0; i<1; i++) {
-		/* check for NULL values ?!?! */
-		reg_db_set_attr(l_uuid, 0);
-		reg_db_set_attr(l_username, 1);
-		reg_db_set_attr(l_domain, 2);
-		reg_db_set_attr(r_username, 3);
-		reg_db_set_attr(r_domain, 4);
-		/* realm may be empty */
-		if(!VAL_NULL(&RES_ROWS(db_res)[i].values[5])) {
-			reg.realm.s = (char*)(RES_ROWS(db_res)[i].values[5].val.string_val);
-			reg.realm.len = strlen(reg.realm.s);
-		}
-		reg_db_set_attr(auth_username, 6);
-		reg_db_set_attr(auth_password, 7);
-		reg_db_set_attr(auth_proxy, 8);
-		reg.expires = (unsigned int)RES_ROWS(db_res)[i].values[9].val.int_val;
-		reg.h_uuid = reg_compute_hash(&reg.l_uuid);
-		reg.h_user = reg_compute_hash(&reg.l_username);
-		reg.flags = (unsigned int)RES_ROWS(db_res)[i].values[10].val.int_val;
-		reg.reg_delay = (unsigned int)RES_ROWS(db_res)[i].values[11].val.int_val;
+	i = 0;
+
+	/* check for NULL values ?!?! */
+	reg_db_set_attr(l_uuid, 0);
+	reg_db_set_attr(l_username, 1);
+	reg_db_set_attr(l_domain, 2);
+	reg_db_set_attr(r_username, 3);
+	reg_db_set_attr(r_domain, 4);
+	/* realm may be empty */
+	if(!VAL_NULL(&RES_ROWS(db_res)[i].values[5])) {
+		reg.realm.s = (char*)(RES_ROWS(db_res)[i].values[5].val.string_val);
+		reg.realm.len = strlen(reg.realm.s);
+	}
+	reg_db_set_attr(auth_username, 6);
+	reg_db_set_attr(auth_password, 7);
+	reg_db_set_attr(auth_proxy, 8);
+	reg.expires = (unsigned int)RES_ROWS(db_res)[i].values[9].val.int_val;
+	reg.h_uuid = reg_compute_hash(&reg.l_uuid);
+	reg.h_user = reg_compute_hash(&reg.l_username);
+	reg.flags = (unsigned int)RES_ROWS(db_res)[i].values[10].val.int_val;
+	reg.reg_delay = (unsigned int)RES_ROWS(db_res)[i].values[11].val.int_val;
 
-		lock_get(_reg_htable_gc_lock);
-		if(reg_ht_get_byuuid(pl_uuid)!=NULL)
+	lock_get(_reg_htable_gc_lock);
+	if(reg_ht_get_byuuid(pl_uuid)!=NULL)
+	{
+		if(reg_ht_update_attrs(&reg)<0)
 		{
-			if(reg_ht_update_attrs(&reg)<0)
-			{
-				lock_release(_reg_htable_gc_lock);
-				LM_ERR("Error updating reg to htable\n");
-				goto error;
-			}
-		} else {
-			if(reg_ht_add(&reg)<0)
-			{
-				lock_release(_reg_htable_gc_lock);
-				LM_ERR("Error adding reg to htable\n");
-				goto error;
-			}
+			lock_release(_reg_htable_gc_lock);
+			LM_ERR("Error updating reg to htable\n");
+			goto error;
+		}
+	} else {
+		if(reg_ht_add(&reg)<0)
+		{
+			lock_release(_reg_htable_gc_lock);
+			LM_ERR("Error adding reg to htable\n");
+			goto error;
 		}
-		lock_release(_reg_htable_gc_lock);
 	}
+	lock_release(_reg_htable_gc_lock);
+
+nextrec:
 
 	reg_dbf.free_result(reg_db_con, db_res);
 	reg_dbf.close(reg_db_con);