[sr-dev] git:master:afbcbfb4: Merge pull request #220 from mslehto/htable

Module: kamailio Branch: master Commit: afbcbfb43b5ddbafa745fc12f7d2365d6e715d89 URL: https://github.com/kamailio/kamailio/commit/afbcbfb43b5ddbafa745fc12f7d2365… Author: Daniel-Constantin Mierla &lt;miconda(a)gmail.com&gt; Committer: Daniel-Constantin Mierla &lt;miconda(a)gmail.com&gt; Date: 2015-06-25T22:20:00+02:00 Merge pull request #220 from mslehto/htable modules/htable: improves error message when loading from database --- Modified: modules/htable/ht_db.c --- Diff: https://github.com/kamailio/kamailio/commit/afbcbfb43b5ddbafa745fc12f7d2365… Patch: https://github.com/kamailio/kamailio/commit/afbcbfb43b5ddbafa745fc12f7d2365… --- diff --git a/modules/htable/ht_db.c b/modules/htable/ht_db.c index 06f3057..4288554 100644 --- a/modules/htable/ht_db.c +++ b/modules/htable/ht_db.c @@ -197,11 +197,17 @@ int ht_db_load_table(ht_t *ht, str *dbtable, int mode) do { for(i=0; i<RES_ROW_N(db_res); i++) { - if(RES_ROWS(db_res)[i].values[0].type!=DB1_STRING - || VAL_NULL(&RES_ROWS(db_res)[i].values[0])) { - LM_ERR("key type must be string and its value not null\n"); + if(VAL_NULL(&RES_ROWS(db_res)[i].values[0])) { + LM_ERR("key value must not be null\n"); goto error; } + + if(RES_ROWS(db_res)[i].values[0].type!=DB1_STRING) { + LM_ERR("key type must be string (type=%d)\n", + RES_ROWS(db_res)[i].values[0].type); + goto error; + } + kname.s = (char*)(RES_ROWS(db_res)[i].values[0].val.string_val); if(kname.s==NULL) { LM_ERR("null key in row %d\n", i);