sr-dev

sr-dev@lists.kamailio.org

17 participants
44127 discussions

git:janakj/postgres: - docs extension: explain fetch_result functionality better to prevent errors

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: be78aade192c328f6c5e567334340ccb24a94484 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=be78aad… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Oct 17 08:01:23 2008 +0000 - docs extension: explain fetch_result functionality better to prevent errors because of wrong usage, found from Juha Heinanen git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5088 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_postgres/km_dbase.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/modules/db_postgres/km_dbase.c b/modules/db_postgres/km_dbase.c index 38bc36f..4ef3343 100644 --- a/modules/db_postgres/km_dbase.c +++ b/modules/db_postgres/km_dbase.c @@ -161,7 +161,15 @@ static int db_postgres_submit_query(const db_con_t* _con, const str* _s) /*! - * \brief Gets a partial result set + * \brief Gets a partial result set, fetch rows from a result + * + * Gets a partial result set, fetch a number of rows from a database result. + * This function initialize the given result structure on the first run, and + * fetches the nrows number of rows. On subsequenting runs, it uses the + * existing result and fetches more rows, until it reaches the end of the + * result set. Because of this the result needs to be null in the first + * invocation of the function. If the number of wanted rows is zero, the + * function returns anything with a result of zero. * \param _con database connection * \param _res result set * \param nrows number of fetches rows

15 years, 10 months

git:janakj/postgres: - fix a bunch of errors in doxygen

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: c41d5135dd9d2f76ac13976662a6b365ff5655d8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c41d513… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Nov 27 12:32:26 2008 +0000 - fix a bunch of errors in doxygen git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5272 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_postgres/km_res.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/db_postgres/km_res.c b/modules/db_postgres/km_res.c index 4207405..a234d1f 100644 --- a/modules/db_postgres/km_res.c +++ b/modules/db_postgres/km_res.c @@ -333,7 +333,7 @@ int db_postgres_convert_rows(const db_con_t* _h, db_res_t* _r) * \param _r result set * \param _row row * \param row_buf row buffer - * \param 0 on success, negative on error + * \return 0 on success, negative on error */ int db_postgres_convert_row(const db_con_t* _h, db_res_t* _r, db_row_t* _row, char **row_buf)

15 years, 10 months

git:janakj/postgres: - add 'db_postgres' prefix to free_query function

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: b77ecccd46def93eec72dabbfea8b1588354d52a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b77eccc… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Dec 11 13:18:35 2008 +0000 - add 'db_postgres' prefix to free_query function - remove a redundant check for the connection in a free_query call git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5326 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_postgres/km_dbase.c | 13 +++++-------- 1 files changed, 5 insertions(+), 8 deletions(-) diff --git a/modules/db_postgres/km_dbase.c b/modules/db_postgres/km_dbase.c index 0f88315..0a5572d 100644 --- a/modules/db_postgres/km_dbase.c +++ b/modules/db_postgres/km_dbase.c @@ -79,7 +79,7 @@ #include "val.h" #include "res.h" -static void free_query(const db_con_t* _con); +static void db_postgres_free_query(const db_con_t* _con); /*! @@ -142,10 +142,7 @@ static int db_postgres_submit_query(const db_con_t* _con, const str* _s) } /* free any previous query that is laying about */ - if(CON_RESULT(_con)) - { - free_query(_con); - } + db_postgres_free_query(_con); /* exec the query */ if (PQsendQuery(CON_CONNECTION(_con), _s->s)) { @@ -298,7 +295,7 @@ int db_postgres_fetch_result(const db_con_t* _con, db_res_t** _res, const int nr * \brief Free database and any old query results * \param _con database connection */ -static void free_query(const db_con_t* _con) +static void db_postgres_free_query(const db_con_t* _con) { if(CON_RESULT(_con)) { @@ -325,7 +322,7 @@ int db_postgres_free_result(db_con_t* _con, db_res_t* _r) LM_ERR("unable to free result structure\n"); return -1; } - free_query(_con); + db_postgres_free_query(_con); return 0; } @@ -453,7 +450,7 @@ int db_postgres_store_result(const db_con_t* _con, db_res_t** _r) } done: - free_query(_con); + db_postgres_free_query(_con); return (rc); }

15 years, 10 months

git:janakj/postgres: - remove LM_ERR probe that slipped into previous commit

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: 53cb4c9bf6fc8eba297a516d5510481994ada829 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=53cb4c9… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Dec 15 16:01:55 2008 +0000 - remove LM_ERR probe that slipped into previous commit git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5360 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_postgres/km_res.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/db_postgres/km_res.c b/modules/db_postgres/km_res.c index 696327a..061f157 100644 --- a/modules/db_postgres/km_res.c +++ b/modules/db_postgres/km_res.c @@ -251,7 +251,7 @@ int db_postgres_convert_rows(const db_con_t* _h, db_res_t* _r) */ if (PQgetisnull(CON_RESULT(_h), row, col) == 0) { row_buf[col] = s; - LM_ERR("[%d][%d] Column[%.*s]=[%s]\n", + LM_DBG("[%d][%d] Column[%.*s]=[%s]\n", row, col, RES_NAMES(_r)[col]->len, RES_NAMES(_r)[col]->s, row_buf[col]); } }

15 years, 10 months

git:janakj/postgres: - fix a few line breaks in errors logs

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: 5c47885dadcb7d107785138277941afaef8f6214 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5c47885… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Jan 5 12:39:57 2009 +0000 - fix a few line breaks in errors logs git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5414 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_postgres/km_res.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/db_postgres/km_res.c b/modules/db_postgres/km_res.c index c1f7509..431b81f 100644 --- a/modules/db_postgres/km_res.c +++ b/modules/db_postgres/km_res.c @@ -223,7 +223,7 @@ int db_postgres_convert_rows(const db_con_t* _h, db_res_t* _r) memset(row_buf, 0, len); if (db_allocate_rows(_r) < 0) { - LM_ERR("could not allocate rows"); + LM_ERR("could not allocate rows\n"); return -2; } @@ -295,7 +295,7 @@ int db_postgres_convert_row(const db_con_t* _h, db_res_t* _r, db_row_t* _row, } if (db_allocate_row(_r, _row) != 0) { - LM_ERR("could not allocate row"); + LM_ERR("could not allocate row\n"); return -2; } @@ -311,7 +311,7 @@ int db_postgres_convert_row(const db_con_t* _h, db_res_t* _r, db_row_t* _row, if (db_postgres_str2val(RES_TYPES(_r)[col], &(ROW_VALUES(_row)[col]), row_buf[col], col_len) < 0) { LM_ERR("failed to convert value\n"); - LM_DBG("free row at %pn", _row); + LM_DBG("free row at %p\n", _row); db_free_row(_row); return -3; }

15 years, 10 months

git:janakj/postgres: - change behaviour of db_str2val, this now copy strings

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: e397c728639835065a3097491b7afc45ee44b1d9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e397c72… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Dec 15 15:07:12 2008 +0000 - change behaviour of db_str2val, this now copy strings - this change was necessary because in some circumstances the memory that is returned from the database driver is used by some other means too fast, causes crashed or wrong results later on, this bug is timing related - this means for mysql and unixodbc that the performance will be decreased a bit, postgres already copied the string, so here nothing change - add a new function to DB core API, db_val2str that, usable to convert numerical values to a string, and common things like NULL values conversion, parameter checks - convert mysql, postgres and unixodbc module to use this new function - convert postgres function to use the core db_str2val function, the copying is now done at a different place, cleanup the code somewhat - remove unnecessary assignment if a NULL value is encountered in postgres - TODO: fix NULL handling and double copying that is done now for unixodbc git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5359 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_postgres/km_res.c | 49 +----------- modules/db_postgres/km_val.c | 175 +++--------------------------------------- 2 files changed, 13 insertions(+), 211 deletions(-) diff --git a/modules/db_postgres/km_res.c b/modules/db_postgres/km_res.c index a234d1f..696327a 100644 --- a/modules/db_postgres/km_res.c +++ b/modules/db_postgres/km_res.c @@ -250,19 +250,9 @@ int db_postgres_convert_rows(const db_con_t* _h, db_res_t* _r) * steps expect. So we need to simulate this here unfortunally. */ if (PQgetisnull(CON_RESULT(_h), row, col) == 0) { - len = strlen(s); - row_buf[col] = pkg_malloc(len+1); - if (!row_buf[col]) { - LM_ERR("no private memory left\n"); - return -1; - } - memset(row_buf[col], 0, len+1); - LM_DBG("allocated %d bytes for row_buf[%d] at %p\n", len, col, row_buf[col]); - strncpy(row_buf[col], s, len); - LM_DBG("[%d][%d] Column[%.*s]=[%s]\n", + row_buf[col] = s; + LM_ERR("[%d][%d] Column[%.*s]=[%s]\n", row, col, RES_NAMES(_r)[col]->len, RES_NAMES(_r)[col]->s, row_buf[col]); - } else { - s = NULL; } } @@ -277,44 +267,9 @@ int db_postgres_convert_rows(const db_con_t* _h, db_res_t* _r) LM_DBG("freeing row buffer at %p\n", row_buf); pkg_free(row_buf); return -4; - } - /* - * pkg_free() must be done for the above allocations now that the row - * has been converted. During pg_convert_row (and subsequent pg_str2val) - * processing, data types that don't need to be converted (namely STRINGS - * and STR) have their addresses saved. These data types should not have - * their pkg_malloc() allocations freed here because they are still - * needed. However, some data types (ex: INT, DOUBLE) should have their - * pkg_malloc() allocations freed because during the conversion process, - * their converted values are saved in the union portion of the db_val_t - * structure. BLOB will be copied during PQunescape in str2val, thus it - * has to be freed here AND in pg_free_row(). - * - * Warning: when the converted row is no longer needed, the data types - * whose addresses were saved in the db_val_t structure must be freed - * or a memory leak will happen. This processing should happen in the - * pg_free_row() subroutine. The caller of this routine should ensure - * that pg_free_rows(), pg_free_row() or pg_free_result() is eventually - * called. - */ - for (col = 0; col < RES_COL_N(_r); col++) { - switch (RES_TYPES(_r)[col]) { - case DB_STRING: - case DB_STR: - break; - default: - LM_DBG("freeing row_buf[%d] at %p\n", col, row_buf[col]); - /* because it can contain NULL */ - if(row_buf[col]) pkg_free(row_buf[col]); - } /* * The following housekeeping may not be technically required, but it * is a good practice to NULL pointer fields that are no longer valid. - * Note that DB_STRING fields have not been pkg_free(). NULLing DB_STRING - * fields would normally not be good to do because a memory leak would - * occur. However, the pg_convert_row() routine has saved the DB_STRING - * pointer in the db_val_t structure. The db_val_t structure will - * eventually be used to pkg_free() the DB_STRING storage. */ row_buf[col] = (char *)NULL; } diff --git a/modules/db_postgres/km_val.c b/modules/db_postgres/km_val.c index 9b7d12b..c83a1b2 100644 --- a/modules/db_postgres/km_val.c +++ b/modules/db_postgres/km_val.c @@ -42,14 +42,11 @@ #include "../../mem/mem.h" #include "val.h" -#include <string.h> -#include <time.h> - /*! - * \brief Convert a str to a db value, does not copy strings + * \brief Convert a str to a db value, copy strings * - * Convert a str to a db value, does not copy strings. + * Convert a str to a db value, copy strings. * The postgresql module uses a custom escape function for BLOBs. * If the _s is linked in the db_val result, it will be returned zero * \param _t destination value type @@ -60,105 +57,10 @@ */ int db_postgres_str2val(const db_type_t _t, db_val_t* _v, const char* _s, const int _l) { - static str dummy_string = {"", 0}; - char *tmp_s; - - if (!_v) { - LM_ERR("invalid parameter value\n"); - } - - /* - * We implemented the mysql behaviour in the db_postgres_convert_rows function, - * so a NULL string is a NULL value, otherwise its an empty value - */ - if (!_s) { - memset(_v, 0, sizeof(db_val_t)); - /* Initialize the string pointers to a dummy empty - * string so that we do not crash when the NULL flag - * is set but the module does not check it properly - */ - VAL_STRING(_v) = dummy_string.s; - VAL_STR(_v) = dummy_string; - VAL_BLOB(_v) = dummy_string; - VAL_TYPE(_v) = _t; - VAL_NULL(_v) = 1; - return 0; - } - VAL_NULL(_v) = 0; - - switch(_t) { - case DB_INT: - LM_DBG("converting INT [%s]\n", _s); - if (db_str2int(_s, &VAL_INT(_v)) < 0) { - LM_ERR("failed to convert INT value from string\n"); - return -2; - } else { - VAL_TYPE(_v) = DB_INT; - return 0; - } - break; - - case DB_BIGINT: - LM_DBG("converting BIGINT [%s]\n", _s); - if (db_str2longlong(_s, &VAL_BIGINT(_v)) < 0) { - LM_ERR("failed to convert BIGINT value from string\n"); - return -3; - } else { - VAL_TYPE(_v) = DB_BIGINT; - return 0; - } - break; - - case DB_BITMAP: - LM_DBG("converting BITMAP [%s]\n", _s); - if (db_str2int(_s, &VAL_INT(_v)) < 0) { - LM_ERR("failed to convert BITMAP value from string\n"); - return -4; - } else { - VAL_TYPE(_v) = DB_BITMAP; - return 0; - } - break; - - case DB_DOUBLE: - LM_DBG("converting DOUBLE [%s]\n", _s); - if (db_str2double(_s, &VAL_DOUBLE(_v)) < 0) { - LM_ERR("failed to convert DOUBLE value from string\n"); - return -5; - } else { - VAL_TYPE(_v) = DB_DOUBLE; - return 0; - } - break; - - case DB_STRING: - LM_DBG("converting STRING [%s]\n", _s); - VAL_STRING(_v) = _s; - VAL_TYPE(_v) = DB_STRING; - VAL_FREE(_v) = 1; - return 0; - - case DB_STR: - LM_DBG("converting STR [%.*s]\n", _l, _s); - VAL_STR(_v).s = (char*)_s; - VAL_STR(_v).len = _l; - VAL_TYPE(_v) = DB_STR; - VAL_FREE(_v) = 1; - _s = 0; - return 0; - - case DB_DATETIME: - LM_DBG("converting DATETIME [%s]\n", _s); - if (db_str2time(_s, &VAL_TIME(_v)) < 0) { - LM_ERR("failed to convert datetime\n"); - return -6; - } else { - VAL_TYPE(_v) = DB_DATETIME; - return 0; - } - break; - - case DB_BLOB: + if ( (_t != DB_BLOB && _v != NULL) || _v == NULL) { + return db_str2val(_t, _v, _s, _l); + } else { + char * tmp_s = NULL; LM_DBG("converting BLOB [%.*s]\n", _l, _s); /* * The string is stored in new allocated memory, which we could @@ -184,8 +86,8 @@ int db_postgres_str2val(const db_type_t _t, db_val_t* _v, const char* _s, const LM_DBG("got blob len %d\n", _l); return 0; + } - return -9; } @@ -201,63 +103,17 @@ int db_postgres_str2val(const db_type_t _t, db_val_t* _v, const char* _s, const */ int db_postgres_val2str(const db_con_t* _con, const db_val_t* _v, char* _s, int* _len) { - int l, ret; + int l, ret, tmp; int pgret; char *tmp_s; size_t tmp_len; char* old_s; - if ((!_v) || (!_s) || (!_len) || (!*_len)) { - LM_ERR("invalid parameter value\n"); - return -1; - } + tmp = db_val2str(_con, _v, _s, _len); + if (tmp < 1) + return tmp; - if (VAL_NULL(_v)) { - if (*_len < sizeof("NULL")) { - LM_ERR("buffer too small\n"); - return -1; - } - *_len = snprintf(_s, *_len, "NULL"); - return 0; - } - switch(VAL_TYPE(_v)) { - case DB_INT: - if (db_int2str(VAL_INT(_v), _s, _len) < 0) { - LM_ERR("failed to convert string to int\n"); - return -2; - } else { - return 0; - } - break; - - case DB_BIGINT: - if (db_longlong2str(VAL_BIGINT(_v), _s, _len) < 0) { - LM_ERR("failed to convert string to big int\n"); - return -3; - } else { - return 0; - } - break; - - case DB_BITMAP: - if (db_int2str(VAL_BITMAP(_v), _s, _len) < 0) { - LM_ERR("failed to convert string to int\n"); - return -4; - } else { - return 0; - } - break; - - case DB_DOUBLE: - if (db_double2str(VAL_DOUBLE(_v), _s, _len) < 0) { - LM_ERR("failed to convert string to double\n"); - return -5; - } else { - return 0; - } - break; - case DB_STRING: l = strlen(VAL_STRING(_v)); if (*_len < (l * 2 + 3)) { @@ -307,15 +163,6 @@ int db_postgres_val2str(const db_con_t* _con, const db_val_t* _v, char* _s, int* } break; - case DB_DATETIME: - if (db_time2str(VAL_TIME(_v), _s, _len) < 0) { - LM_ERR("failed to convert string to time_t\n"); - return -8; - } else { - return 0; - } - break; - case DB_BLOB: l = VAL_BLOB(_v).len; /* this estimation is not always correct, thus we need to check later again */

15 years, 10 months

git:janakj/postgres: - unify common rows and row allocation functionality in the DB API core

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: e79a47ceec2647b99ee1408c3e5218ffeee41fa8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e79a47c… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Dec 15 16:33:22 2008 +0000 - unify common rows and row allocation functionality in the DB API core git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5362 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_postgres/km_res.c | 33 +++++++-------------------------- 1 files changed, 7 insertions(+), 26 deletions(-) diff --git a/modules/db_postgres/km_res.c b/modules/db_postgres/km_res.c index 061f157..c1f7509 100644 --- a/modules/db_postgres/km_res.c +++ b/modules/db_postgres/km_res.c @@ -222,16 +222,10 @@ int db_postgres_convert_rows(const db_con_t* _h, db_res_t* _r) LM_DBG("allocate for %d columns %d bytes in row buffer at %p\n", RES_COL_N(_r), len, row_buf); memset(row_buf, 0, len); - /* Allocate a row structure for each row in the current fetch. */ - len = sizeof(db_row_t) * RES_ROW_N(_r); - RES_ROWS(_r) = (db_row_t*)pkg_malloc(len); - LM_DBG("allocate %d bytes for %d rows at %p\n", len, RES_ROW_N(_r), RES_ROWS(_r)); - - if (!RES_ROWS(_r)) { - LM_ERR("no private memory left\n"); - return -1; + if (db_allocate_rows(_r) < 0) { + LM_ERR("could not allocate rows"); + return -2; } - memset(RES_ROWS(_r), 0, len); for(row = RES_LAST_ROW(_r); row < (RES_LAST_ROW(_r) + RES_ROW_N(_r)); row++) { for(col = 0; col < RES_COL_N(_r); col++) { @@ -293,30 +287,17 @@ int db_postgres_convert_rows(const db_con_t* _h, db_res_t* _r) int db_postgres_convert_row(const db_con_t* _h, db_res_t* _r, db_row_t* _row, char **row_buf) { - int col, len, col_len; + int col, col_len; if (!_h || !_r || !_row) { LM_ERR("invalid parameter value\n"); return -1; } - /* - * Allocate storage to hold the data type value converted from a string - * because PostgreSQL returns (most) data as strings - */ - len = sizeof(db_val_t) * RES_COL_N(_r); - ROW_VALUES(_row) = (db_val_t*)pkg_malloc(len); - - if (!ROW_VALUES(_row)) { - LM_ERR("no private memory left\n"); - return -1; + if (db_allocate_row(_r, _row) != 0) { + LM_ERR("could not allocate row"); + return -2; } - LM_DBG("allocate %d bytes for row values at %p\n", len, ROW_VALUES(_row)); - ROW_N(_row) = RES_COL_N(_r); - memset(ROW_VALUES(_row), 0, len); - - /* Save the number of columns in the ROW structure */ - ROW_N(_row) = RES_COL_N(_r); /* For each column in the row */ for(col = 0; col < ROW_N(_row); col++) {

15 years, 10 months

git:janakj/postgres: - partial revert of commit rev5359 for db_mysql module

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: afb8dada6795769df4c0158e980bdbfd062e57a4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=afb8dad… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Jan 5 18:29:35 2009 +0000 - partial revert of commit rev5359 for db_mysql module - generalize db_str2val function in the DB API core, the string copying behaviour can now configured (its done for db_postgres, db_unixodbc, not done for db_mysql like in the 1.3, 1.4 branches) - still TODO: fix NULL case in db_unixodbc, try to fix double copying git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5423 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_postgres/km_val.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/db_postgres/km_val.c b/modules/db_postgres/km_val.c index c83a1b2..7cc308a 100644 --- a/modules/db_postgres/km_val.c +++ b/modules/db_postgres/km_val.c @@ -58,7 +58,7 @@ int db_postgres_str2val(const db_type_t _t, db_val_t* _v, const char* _s, const int _l) { if ( (_t != DB_BLOB && _v != NULL) || _v == NULL) { - return db_str2val(_t, _v, _s, _l); + return db_str2val(_t, _v, _s, _l, 1); } else { char * tmp_s = NULL; LM_DBG("converting BLOB [%.*s]\n", _l, _s);

15 years, 10 months

git:janakj/postgres: - add one DBG log to each drivers error condition, that the mem is freed

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: ec4a6f2a2ce00e666c828f36e0afc0ddf4e44708 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ec4a6f2… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Jan 7 14:46:10 2009 +0000 - add one DBG log to each drivers error condition, that the mem is freed git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5431 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_postgres/km_dbase.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules/db_postgres/km_dbase.c b/modules/db_postgres/km_dbase.c index da85c46..88075e3 100644 --- a/modules/db_postgres/km_dbase.c +++ b/modules/db_postgres/km_dbase.c @@ -414,6 +414,7 @@ int db_postgres_store_result(const db_con_t* _con, db_res_t** _r) * (such as a SELECT or SHOW). */ if (db_postgres_convert_result(_con, *_r) < 0) { LM_ERR("error while converting result\n"); + LM_DBG("freeing result set at %p\n", _r); pkg_free(*_r); *_r = 0; rc = -4;

15 years, 10 months

git:janakj/postgres: - db_postgres_convert_rows needs to free the row_buf on all error conditions

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: d25ca3c1ae11a6e65120441cb86ffdec7185f328 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d25ca3c… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Jan 7 13:32:44 2009 +0000 - db_postgres_convert_rows needs to free the row_buf on all error conditions - db_postgres_convert_rows now free all rows when a processing error happens - as now all memory is freed in error condition in the later steps, we can change the logic db_postgres_store_result to only free the result in this case, this fixes one crash in a out of memory error condition - sync error msg with mysql, remove unnecessary connection pointer output git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5428 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_postgres/km_dbase.c | 4 ++-- modules/db_postgres/km_res.c | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/db_postgres/km_dbase.c b/modules/db_postgres/km_dbase.c index 0a5572d..b02a5ad 100644 --- a/modules/db_postgres/km_dbase.c +++ b/modules/db_postgres/km_dbase.c @@ -413,8 +413,8 @@ int db_postgres_store_result(const db_con_t* _con, db_res_t** _r) /* Successful completion of a command returning data * (such as a SELECT or SHOW). */ if (db_postgres_convert_result(_con, *_r) < 0) { - LM_ERR("%p Error returned from convert_result()\n", _con); - db_free_result(*_r); + LM_ERR("error while converting result\n"); + pkg_free(*_r); *_r = 0; rc = -4; break; diff --git a/modules/db_postgres/km_res.c b/modules/db_postgres/km_res.c index 431b81f..548e535 100644 --- a/modules/db_postgres/km_res.c +++ b/modules/db_postgres/km_res.c @@ -224,6 +224,8 @@ int db_postgres_convert_rows(const db_con_t* _h, db_res_t* _r) if (db_allocate_rows(_r) < 0) { LM_ERR("could not allocate rows\n"); + LM_DBG("freeing row buffer at %p\n", row_buf); + pkg_free(row_buf); return -2; } @@ -260,6 +262,7 @@ int db_postgres_convert_rows(const db_con_t* _h, db_res_t* _r) } 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

15 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev