sr-dev February 2009

sr-dev@lists.kamailio.org

13 participants
478 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 doxygen errors (mostly in modules, some in the core)

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: 4af0aa101d874f48d4f1f28681d060de4740361a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4af0aa1… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Dec 4 18:12:33 2008 +0000 - fix a bunch of doxygen errors (mostly in modules, some in the core) - credits belongs to Frederick Bullik, frederick dot bullik at 1und1 dot de git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5299 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_postgres/km_dbase.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/db_postgres/km_dbase.c b/modules/db_postgres/km_dbase.c index 4ef3343..0f88315 100644 --- a/modules/db_postgres/km_dbase.c +++ b/modules/db_postgres/km_dbase.c @@ -107,7 +107,7 @@ void db_postgres_close(db_con_t* _h) /*! * \brief Submit_query, run a query - * \param _h database connection + * \param _con database connection * \param _s query string * \return 0 on success, negative on failure */ @@ -296,7 +296,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 _h database connection + * \param _con database connection */ static void free_query(const db_con_t* _con) { @@ -332,7 +332,7 @@ int db_postgres_free_result(db_con_t* _con, db_res_t* _r) /*! * \brief Query table for specified rows - * \param _con structure representing database connection + * \param _h structure representing database connection * \param _k key names * \param _op operators * \param _v values of the keys that must match @@ -340,6 +340,7 @@ int db_postgres_free_result(db_con_t* _con, db_res_t* _r) * \param _n nmber of key=values pairs to compare * \param _nc number of columns to return * \param _o order by the specified column + * \param _r result set * \return 0 on success, negative on failure */ int db_postgres_query(const db_con_t* _h, const db_key_t* _k, const db_op_t* _op,

15 years, 10 months

git:janakj/postgres: - fix postgres NULL value behaviour: as in postgres a NULL value is

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: 26a598b38bb3d9018145e44b54c8ae09145f8616 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=26a598b… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Nov 13 16:35:55 2008 +0000 - fix postgres NULL value behaviour: as in postgres a NULL value is represented from an empty string (just as a empty value), we need to check it with PQgetisnull - as further processing steps assume that we use the mysql behaviour, were a NULL value is represented from a NULL string, we need to simulate this here - better would be to get rid of this row_buf completely, and to use just some function parameter to signalize NULLs to the later steps - synchronize db_postgres_val2str behaviour to the mysql and unixodbc modules, fail also in the NULL case when the buffer is to small - reported from Matteo Piazza, matteo dot piazza at trentinonetwork dot it git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5199 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_postgres/km_res.c | 41 ++++++++++++++++++++++++++++------------- modules/db_postgres/km_val.c | 8 ++++++++ 2 files changed, 36 insertions(+), 13 deletions(-) diff --git a/modules/db_postgres/km_res.c b/modules/db_postgres/km_res.c index e493439..4207405 100644 --- a/modules/db_postgres/km_res.c +++ b/modules/db_postgres/km_res.c @@ -235,15 +235,21 @@ int db_postgres_convert_rows(const db_con_t* _h, db_res_t* _r) 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++) { - /* - * The row data pointer returned by PQgetvalue points to storage - * that is part of the PGresult structure. One should not modify - * the data it points to, and one must explicitly copy the data - * into other storage if it is to be used past the lifetime of - * the PGresult structure itself. - */ - s = PQgetvalue(CON_RESULT(_h), row, col); - LM_DBG("PQgetvalue(%p,%d,%d)=[%s]\n", _h, row, col, s); + /* + * The row data pointer returned by PQgetvalue points to storage + * that is part of the PGresult structure. One should not modify + * the data it points to, and one must explicitly copy the data + * into other storage if it is to be used past the lifetime of + * the PGresult structure itself. + */ + s = PQgetvalue(CON_RESULT(_h), row, col); + LM_DBG("PQgetvalue(%p,%d,%d)=[%s]\n", _h, row, col, s); + /* + * A empty string can be a NULL value, or just an empty string. + * This differs from the mysql behaviour, that further processing + * 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]) { @@ -252,10 +258,12 @@ int db_postgres_convert_rows(const db_con_t* _h, db_res_t* _r) } 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, col, RES_NAMES(_r)[col]->len, RES_NAMES(_r)[col]->s, row_buf[col]); + } else { + s = NULL; + } } /* ASSERT: row_buf contains an entire row in strings */ @@ -296,7 +304,8 @@ int db_postgres_convert_rows(const db_con_t* _h, db_res_t* _r) break; default: LM_DBG("freeing row_buf[%d] at %p\n", col, row_buf[col]); - pkg_free(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 @@ -329,7 +338,7 @@ 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; + int col, len, col_len; if (!_h || !_r || !_row) { LM_ERR("invalid parameter value\n"); @@ -356,9 +365,15 @@ int db_postgres_convert_row(const db_con_t* _h, db_res_t* _r, db_row_t* _row, /* For each column in the row */ for(col = 0; col < ROW_N(_row); col++) { + /* because it can contain NULL */ + if (!row_buf[col]) { + col_len = 0; + } else { + col_len = strlen(row_buf[col]); + } /* Convert the string representation into the value representation */ if (db_postgres_str2val(RES_TYPES(_r)[col], &(ROW_VALUES(_row)[col]), - row_buf[col], strlen(row_buf[col])) < 0) { + row_buf[col], col_len) < 0) { LM_ERR("failed to convert value\n"); LM_DBG("free row at %pn", _row); db_free_row(_row); diff --git a/modules/db_postgres/km_val.c b/modules/db_postgres/km_val.c index 8024d52..d5a3115 100644 --- a/modules/db_postgres/km_val.c +++ b/modules/db_postgres/km_val.c @@ -66,6 +66,10 @@ int db_postgres_str2val(const db_type_t _t, db_val_t* _v, const char* _s, const 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 @@ -195,6 +199,10 @@ int db_postgres_val2str(const db_con_t* _con, const db_val_t* _v, char* _s, int* } if (VAL_NULL(_v)) { + if (*_len < sizeof("NULL")) { + LM_ERR("buffer too small\n"); + return -1; + } *_len = snprintf(_s, *_len, "NULL"); return 0; }

15 years, 10 months

git:janakj/postgres: - fix memory leak in db_postgres module related to BLOBs (also caused an

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: f09596d32a99108f6c34f5fa3641be3dd6470b24 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f09596d… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Nov 24 17:38:46 2008 +0000 - fix memory leak in db_postgres module related to BLOBs (also caused an abort in a assertion when DBG_QM_MALLOC memory manager is used) - PQunescapeBytea is used for BLOBs, this allocates new memory, which could not freed from us later in pkg_free in the DB core - thus we need to allocate new memory for this datatype, copy the string and free the postgres result after that - small comment fix git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5250 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_postgres/km_val.c | 30 ++++++++++++++++++++++-------- 1 files changed, 22 insertions(+), 8 deletions(-) diff --git a/modules/db_postgres/km_val.c b/modules/db_postgres/km_val.c index d5a3115..9b7d12b 100644 --- a/modules/db_postgres/km_val.c +++ b/modules/db_postgres/km_val.c @@ -61,6 +61,7 @@ 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"); @@ -159,19 +160,32 @@ int db_postgres_str2val(const db_type_t _t, db_val_t* _v, const char* _s, const case DB_BLOB: LM_DBG("converting BLOB [%.*s]\n", _l, _s); - /* PQunescapeBytea: Converts a string representation of binary data - * into binary data - the reverse of PQescapeBytea. - * This is needed when retrieving bytea data in text format, - * but not when retrieving it in binary format. + /* + * The string is stored in new allocated memory, which we could + * not free later thus we need to copy it to some new memory here. */ - VAL_BLOB(_v).s = (char*)PQunescapeBytea((unsigned char*)_s, - (size_t*)(void*)&(VAL_BLOB(_v).len) ); + tmp_s = (char*)PQunescapeBytea((unsigned char*)_s, (size_t*)(void*)&(VAL_BLOB(_v).len)); + if(tmp_s==NULL) { + LM_ERR("PQunescapeBytea failed\n"); + return -7; + } + VAL_BLOB(_v).s = pkg_malloc(VAL_BLOB(_v).len); + if (VAL_BLOB(_v).s == NULL) { + LM_ERR("no private memory left\n"); + PQfreemem(tmp_s); + return -8; + } + LM_DBG("allocate %d bytes memory for BLOB at %p", VAL_BLOB(_v).len, VAL_BLOB(_v).s); + memcpy(VAL_BLOB(_v).s, tmp_s, VAL_BLOB(_v).len); + PQfreemem(tmp_s); + VAL_TYPE(_v) = DB_BLOB; VAL_FREE(_v) = 1; + LM_DBG("got blob len %d\n", _l); return 0; } - return -7; + return -9; } @@ -314,7 +328,7 @@ int db_postgres_val2str(const db_con_t* _con, const db_val_t* _v, char* _s, int* (size_t)l, (size_t*)&tmp_len); if(tmp_s==NULL) { - LM_ERR("PQescapeBytea failed\n"); + LM_ERR("PQescapeByteaConn failed\n"); return -9; } if (tmp_len > *_len) {

15 years, 10 months

git:janakj/postgres: - remove not reached return statement at the end of val2str functions

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: 8737295bc65e8b4bdf549a967d8dd8c0176f363e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8737295… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Sep 19 11:56:49 2008 +0000 - remove not reached return statement at the end of val2str functions git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4965 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_postgres/km_val.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/modules/db_postgres/km_val.c b/modules/db_postgres/km_val.c index 21468d7..8024d52 100644 --- a/modules/db_postgres/km_val.c +++ b/modules/db_postgres/km_val.c @@ -327,5 +327,4 @@ int db_postgres_val2str(const db_con_t* _con, const db_val_t* _v, char* _s, int* LM_DBG("unknown data type\n"); return -10; } - return -8; }

15 years, 10 months

git:janakj/postgres: - make small wrapper around PQclear void, nobody checks the return state

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: abf8e6a4dd9531420b3c0a9dea559377f2ad13b2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=abf8e6a… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Sep 19 11:28:06 2008 +0000 - make small wrapper around PQclear void, nobody checks the return state - sync db_postgres_free_result function logic with the mysql and unixodbc modules (check for errors in db_free_result, not necessary set res to 0) git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4964 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_postgres/km_dbase.c | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/modules/db_postgres/km_dbase.c b/modules/db_postgres/km_dbase.c index 41a6d51..38bc36f 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 int free_query(const db_con_t* _con); +static void free_query(const db_con_t* _con); /*! @@ -289,9 +289,8 @@ 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 _h database connection - * \return 0 */ -static int free_query(const db_con_t* _con) +static void free_query(const db_con_t* _con) { if(CON_RESULT(_con)) { @@ -299,8 +298,6 @@ static int free_query(const db_con_t* _con) PQclear(CON_RESULT(_con)); CON_RESULT(_con) = 0; } - - return 0; } @@ -308,14 +305,19 @@ static int free_query(const db_con_t* _con) * \brief Free the query and the result memory in the core * \param _con database connection * \param _r result set - * \return 0 + * \return 0 on success, -1 on failure */ int db_postgres_free_result(db_con_t* _con, db_res_t* _r) { + if ((!_con) || (!_r)) { + LM_ERR("invalid parameter value\n"); + return -1; + } + if (db_free_result(_r) < 0) { + LM_ERR("unable to free result structure\n"); + return -1; + } free_query(_con); - if (_r) db_free_result(_r); - _r = 0; - return 0; }

15 years, 10 months

git:janakj/postgres: - doxygen conversion, write new documentation, small cleanups

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: e7d596848ee7959fc5481bf669d9207d790cf7d3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e7d5968… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Sep 19 09:45:51 2008 +0000 - doxygen conversion, write new documentation, small cleanups git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4963 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_postgres/km_db_postgres.c | 29 +++-- modules/db_postgres/km_dbase.c | 228 +++++++++++++++------------------- modules/db_postgres/km_dbase.h | 33 +++--- modules/db_postgres/km_pg_con.c | 21 +++- modules/db_postgres/km_pg_con.h | 35 +++--- modules/db_postgres/km_res.c | 45 +++++--- modules/db_postgres/km_res.h | 7 +- modules/db_postgres/km_val.c | 33 ++++-- modules/db_postgres/km_val.h | 8 +- 9 files changed, 233 insertions(+), 206 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=e7d…

15 years, 10 months

git:janakj/postgres: - initial support for BIGINT database in DB core and SQL based database

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: af688644ebc2ac3e78fc1f1c5ddd6fcb05602eda URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=af68864… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Sep 16 16:44:10 2008 +0000 - initial support for BIGINT database in DB core and SQL based database modules, closes patch #2101659 - some tests for mysql were done, but more testing, especially for the postgres and unixodbc would be appreciated - Todo: fix other DB modules, at the moment some warnings are printed during compilation because of the unhandled BIGINT state git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4928 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_postgres/km_res.c | 5 +++- modules/db_postgres/km_val.c | 50 +++++++++++++++++++++++++++++------------ 2 files changed, 39 insertions(+), 16 deletions(-) diff --git a/modules/db_postgres/km_res.c b/modules/db_postgres/km_res.c index 95e5c11..24a1fcd 100644 --- a/modules/db_postgres/km_res.c +++ b/modules/db_postgres/km_res.c @@ -131,11 +131,14 @@ int db_postgres_get_columns(const db_con_t* _h, db_res_t* _r) { case INT2OID: case INT4OID: - case INT8OID: LM_DBG("use DB_INT result type\n"); RES_TYPES(_r)[col] = DB_INT; break; + case INT8OID: + LM_DBG("use DB_BIGINT result type\n"); + RES_TYPES(_r)[col] = DB_BIGINT; + case FLOAT4OID: case FLOAT8OID: case NUMERICOID: diff --git a/modules/db_postgres/km_val.c b/modules/db_postgres/km_val.c index 44e7dad..ce82b97 100644 --- a/modules/db_postgres/km_val.c +++ b/modules/db_postgres/km_val.c @@ -87,11 +87,22 @@ int db_postgres_str2val(const db_type_t _t, db_val_t* _v, const char* _s, const } 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 -3; + return -4; } else { VAL_TYPE(_v) = DB_BITMAP; return 0; @@ -102,7 +113,7 @@ int db_postgres_str2val(const db_type_t _t, db_val_t* _v, const char* _s, const 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 -4; + return -5; } else { VAL_TYPE(_v) = DB_DOUBLE; return 0; @@ -129,7 +140,7 @@ int db_postgres_str2val(const db_type_t _t, db_val_t* _v, const char* _s, const LM_DBG("converting DATETIME [%s]\n", _s); if (db_str2time(_s, &VAL_TIME(_v)) < 0) { LM_ERR("failed to convert datetime\n"); - return -5; + return -6; } else { VAL_TYPE(_v) = DB_DATETIME; return 0; @@ -150,7 +161,7 @@ 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 -6; + return -7; } @@ -185,10 +196,19 @@ int db_postgres_val2str(const db_con_t* _con, const db_val_t* _v, char* _s, int* } 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 -3; + return -4; } else { return 0; } @@ -197,7 +217,7 @@ int db_postgres_val2str(const db_con_t* _con, const db_val_t* _v, char* _s, int* case DB_DOUBLE: if (db_double2str(VAL_DOUBLE(_v), _s, _len) < 0) { LM_ERR("failed to convert string to double\n"); - return -3; + return -5; } else { return 0; } @@ -207,7 +227,7 @@ int db_postgres_val2str(const db_con_t* _con, const db_val_t* _v, char* _s, int* l = strlen(VAL_STRING(_v)); if (*_len < (l * 2 + 3)) { LM_ERR("destination buffer too short for string\n"); - return -4; + return -6; } else { old_s = _s; *_s++ = '\''; @@ -216,7 +236,7 @@ int db_postgres_val2str(const db_con_t* _con, const db_val_t* _v, char* _s, int* if(pgret!=0) { LM_ERR("PQescapeStringConn failed\n"); - return -4; + return -6; } LM_DBG("PQescapeStringConn: in: %d chars," " out: %d chars\n", l, ret); @@ -232,7 +252,7 @@ int db_postgres_val2str(const db_con_t* _con, const db_val_t* _v, char* _s, int* l = VAL_STR(_v).len; if (*_len < (l * 2 + 3)) { LM_ERR("destination buffer too short for str\n"); - return -5; + return -7; } else { old_s = _s; *_s++ = '\''; @@ -241,7 +261,7 @@ int db_postgres_val2str(const db_con_t* _con, const db_val_t* _v, char* _s, int* if(pgret!=0) { LM_ERR("PQescapeStringConn failed \n"); - return -5; + return -7; } LM_DBG("PQescapeStringConn: in: %d chars, out: %d chars\n", l, ret); _s += ret; @@ -255,7 +275,7 @@ int db_postgres_val2str(const db_con_t* _con, const db_val_t* _v, char* _s, int* case DB_DATETIME: if (db_time2str(VAL_TIME(_v), _s, _len) < 0) { LM_ERR("failed to convert string to time_t\n"); - return -6; + return -8; } else { return 0; } @@ -266,7 +286,7 @@ int db_postgres_val2str(const db_con_t* _con, const db_val_t* _v, char* _s, int* /* this estimation is not always correct, thus we need to check later again */ if (*_len < (l * 2 + 3)) { LM_ERR("destination buffer too short for blob\n"); - return -7; + return -9; } else { *_s++ = '\''; tmp_s = (char*)PQescapeByteaConn(CON_CONNECTION(_con), (unsigned char*)VAL_STRING(_v), @@ -274,11 +294,11 @@ int db_postgres_val2str(const db_con_t* _con, const db_val_t* _v, char* _s, int* if(tmp_s==NULL) { LM_ERR("PQescapeBytea failed\n"); - return -7; + return -9; } if (tmp_len > *_len) { LM_ERR("escaped result too long\n"); - return -7; + return -9; } memcpy(_s, tmp_s, tmp_len); PQfreemem(tmp_s); @@ -292,7 +312,7 @@ int db_postgres_val2str(const db_con_t* _con, const db_val_t* _v, char* _s, int* default: LM_DBG("unknown data type\n"); - return -7; + return -10; } return -8; }

15 years, 10 months

git:janakj/postgres: - fix warning related to amd64

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: a1b6b664b5ca852a320d09fc8bfd73c9cd44a1d6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a1b6b66… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Sep 12 11:21:41 2008 +0000 - fix warning related to amd64 git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4894 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 4dc07ad..95e5c11 100644 --- a/modules/db_postgres/km_res.c +++ b/modules/db_postgres/km_res.c @@ -116,7 +116,7 @@ int db_postgres_get_columns(const db_con_t* _h, db_res_t* _r) db_free_columns(_r); return -4; } - LM_DBG("allocate %d bytes for RES_NAMES[%d] at %p\n", sizeof(str), col, + LM_DBG("allocate %d bytes for RES_NAMES[%d] at %p\n", (unsigned int) sizeof(str), col, RES_NAMES(_r)[col]); /* The pointer that is here returned is part of the result structure. */

15 years, 10 months

git:janakj/postgres: - multiple fixes:

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: d65be2c006880ec492de2d106c570011efcac0e6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d65be2c… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Sep 1 10:27:02 2008 +0000 - multiple fixes: 1) test memory allocations 2) return code overlapping in case of error (missing break) 3) bogus/ not needed NULL tests for result freeing - credits goes to Bogdan git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4784 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_postgres/km_dbase.c | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-) diff --git a/modules/db_postgres/km_dbase.c b/modules/db_postgres/km_dbase.c index 29f817c..49c276c 100644 --- a/modules/db_postgres/km_dbase.c +++ b/modules/db_postgres/km_dbase.c @@ -405,6 +405,11 @@ int db_postgres_store_result(const db_con_t* _con, db_res_t** _r) int rc = 0; *_r = db_new_result(); + if (*_r==NULL) { + LM_ERR("failed to init new result\n"); + rc = -1; + goto done; + } while (1) { if ((res = PQgetResult(CON_CONNECTION(_con)))) { @@ -421,18 +426,20 @@ int db_postgres_store_result(const db_con_t* _con, db_res_t** _r) switch(pqresult) { case PGRES_COMMAND_OK: - /* Successful completion of a command returning no data (such as INSERT or UPDATE). */ + /* Successful completion of a command returning no data + * (such as INSERT or UPDATE). */ rc = 0; break; case PGRES_TUPLES_OK: - /* Successful completion of a command returning data (such as a SELECT or SHOW). */ + /* 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); - if (*_r) db_free_result(*_r); - + db_free_result(*_r); *_r = 0; rc = -4; + break; } rc = 0; break; @@ -441,7 +448,7 @@ int db_postgres_store_result(const db_con_t* _con, db_res_t** _r) LM_ERR("%p - invalid query, execution aborted\n", _con); LM_ERR("%p: %s\n", _con, PQresStatus(pqresult)); LM_ERR("%p: %s\n", _con, PQresultErrorMessage(CON_RESULT(_con))); - if (*_r) db_free_result(*_r); + db_free_result(*_r); *_r = 0; rc = -3; break; @@ -458,13 +465,13 @@ int db_postgres_store_result(const db_con_t* _con, db_res_t** _r) LM_ERR("%p Probable invalid query\n", _con); LM_ERR("%p: %s\n", _con, PQresStatus(pqresult)); LM_ERR("%p: %s\n", _con, PQresultErrorMessage(CON_RESULT(_con))); - if (*_r) db_free_result(*_r); - + db_free_result(*_r); *_r = 0; rc = -4; break; } +done: free_query(_con); return (rc); }

15 years, 10 months

← Newer
1
...
14
15
16
17
18
19
20
...
48
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2009