Module: sip-router
Branch: janakj/postgres
Commit: 70764fb02a5be0f7ccca4f6e66adbdf083fdaea8
URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=70764fb…
Author: Henning Westerholt <henning.westerholt(a)1und1.de>
Committer: Henning Westerholt <henning.westerholt(a)1und1.de>
Date: Fri Jan 9 13:23:11 2009 +0000
- another error condition fix for a problem that gets introduced by a
recent change: don't try to free memory in the row_buf that don't
belong to us anymore
- reported by Bayan Towfiq, bayan at flowroute dot com
- remove row_buf[col] NULL assignment that was not executed anyway
git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5438 689a6050-402a-0410-94f2-e92a70836424
---
modules/db_postgres/km_res.c | 9 ---------
1 files changed, 0 insertions(+), 9 deletions(-)
diff --git a/modules/db_postgres/km_res.c b/modules/db_postgres/km_res.c
index 548e535..0cd80c5 100644
--- a/modules/db_postgres/km_res.c
+++ b/modules/db_postgres/km_res.c
@@ -256,19 +256,10 @@ int db_postgres_convert_rows(const db_con_t* _h, db_res_t* _r)
if(db_postgres_convert_row(_h, _r, &(RES_ROWS(_r)[row - RES_LAST_ROW(_r)]), row_buf)<0){
LM_ERR("failed to convert row #%d\n", row);
RES_ROW_N(_r) = row - RES_LAST_ROW(_r);
- for (col = 0; col < RES_COL_N(_r); col++) {
- LM_DBG("freeing row_buf[%d] at %p\n", col, row_buf[col]);
- pkg_free(row_buf[col]);
- }
LM_DBG("freeing row buffer at %p\n", row_buf);
pkg_free(row_buf);
db_free_rows(_r);
return -4;
- /*
- * The following housekeeping may not be technically required, but it
- * is a good practice to NULL pointer fields that are no longer valid.
- */
- row_buf[col] = (char *)NULL;
}
}
Module: sip-router
Branch: janakj/postgres
Commit: 269f7048510ed8f84ea0b568df53000d1421ddf8
URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=269f704…
Author: Jan Janak <jan(a)iptel.org>
Committer: Jan Janak <jan(a)iptel.org>
Date: Tue Feb 17 14:48:05 2009 +0100
Merge branch 'master' of ssh://janakj@git.sip-router.org/sip-router into postgres
* 'master' of ssh://janakj@git.sip-router.org/sip-router: (194 commits)
Support for db driver names with "db_" prefix in libsrdb2.
Make sure mod_init from kamailio/db_mysql is called.
Export kamailio/db_mysql parameters through the module api.
Export db_bind_api through the module interface.
Eliminate conflicts with files imported from ser/mysql modules.
DB_* renamed to DB1_* in files originating from kamailio/db_mysql.
db_res renamed to db1_res in files originating from kamailio/db_mysql.
db_con renamed to db1_con in files originating from kamailio/db_mysql.
Integration of both modules, first step.
Module name changed to db_mysql.
Changes necessary to make the module compile in the sip-router tree.
- fixed auto_reconnect c&p error
- add one DBG log to each drivers error condition, that the mem is freed
- fix one DBG msg (still using module prefix), two small indention fixes
- partial revert of commit rev5359 for db_mysql module
- add group functionality to read content from specified sections
- unify common rows and row allocation functionality in the DB API core
- change behaviour of db_str2val, this now copy strings
- move db_mysql and db_unixodbc str2val implementation to the DB core,
- fix a few errors in doxygen documentation
...
---