Merge pull request #3504 from GangZhuo/master

db_oracle: Fix issues#3505 "invalid parameter value" when do sql_query("update ...")
OpenSIPS · Nov 15, 2024 · d94c7a8 · d94c7a8
2 parents 2bc77a5 + b5133bd
commit d94c7a8
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/modules/db_oracle/dbase.c b/modules/db_oracle/dbase.c
@@ -189,11 +189,15 @@ int db_oracle_free_result(db_con_t* _h, db_res_t* _r)
 {
 	ub4 i;
 
-	if (!_h || !_r) {
+	if (!_h) {
 		LM_ERR("invalid parameter value\n");
 		return -1;
 	}
 
+	if (!_r) {
+		return 0; /* nothing to free */
+	}
+
 	if (RES_NAMES(_r))
 		for (i=0; i < RES_COL_N(_r); ++i)
 			if (RES_NAMES(_r)[i]->s)
@@ -415,7 +419,6 @@ int db_oracle_raw_query(const db_con_t* _h, const str* _s, db_res_t** _r)
 			return -2;
 		}
 #undef _S_DIFF
-		if (_r) goto badparam;
 		cb._rs = NULL;
 	}
 

diff --git a/modules/db_oracle/res.c b/modules/db_oracle/res.c
@@ -457,9 +457,14 @@ int db_oracle_store_result(const db_con_t* _h, db_res_t** _r)
 	    query_data_t *pcb = con->pqdata;
 
 
-	    if (!pcb || !pcb->_rs)
+		if (!pcb)
 		    goto badparam;
 
+		if (!pcb->_rs) {
+			if (_r)	*_r = NULL;
+			return 0; /* No results */
+		}
+
 	    hs = *pcb->_rs;
 	    pcb->_rs = NULL; /* paranoid for next call */
 	}

diff --git a/modules/usrloc/dlist.c b/modules/usrloc/dlist.c
@@ -151,7 +151,7 @@ static int get_domain_db_ucontacts(udomain_t *d, void *buf, int *len,
 
 	i = snprintf(query_buf, sizeof query_buf, "select %.*s, %.*s, %.*s,"
 #ifdef ORACLE_USRLOC
-	" %.*s, %.*s, %.*s from %s where %.*s > %lu and mod(contact_id, %u) = %u",
+	" %.*s, %.*s, %.*s from %s where %.*s > %lld and mod(contact_id, %u) = %u",
 #else
 	" %.*s, %.*s, %.*s from %s where %.*s > %lld and contact_id %% %u = %u",
 #endif