Mercurial > dovecot > core-2.2
changeset 22959:99445a6b0bfd
dict-sql: dict doesn't support NULL values, so convert SQL NULLs to ""
| author | Timo Sirainen <timo.sirainen@dovecot.fi> |
|---|---|
| date | Fri, 06 Oct 2017 15:54:47 +0300 |
| parents | a8220182eac6 |
| children | f10330f73af6 |
| files | src/lib-dict/dict-sql.c |
| diffstat | 1 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/lib-dict/dict-sql.c Fri Oct 06 15:52:36 2017 +0300 +++ b/src/lib-dict/dict-sql.c Fri Oct 06 15:54:47 2017 +0300 @@ -486,13 +486,15 @@ { const unsigned char *data; size_t size; + const char *value; string_t *str; switch (type) { case DICT_SQL_TYPE_STRING: case DICT_SQL_TYPE_INT: case DICT_SQL_TYPE_UINT: - return p_strdup(pool, sql_result_get_field_value(result, result_idx)); + value = sql_result_get_field_value(result, result_idx); + return value == NULL ? "" : p_strdup(pool, value); case DICT_SQL_TYPE_HEXBLOB: break; }