dict-sql: dict doesn't support NULL values, so convert SQL NULLs to ""

diff --git a/src/lib-dict/dict-sql.c b/src/lib-dict/dict-sql.c
index 1d163320ad828866b7001ce92d757654d0fd0c05..d860f7e6bcfdd506605e668d15e8532002efa589 100644 (file)
--- a/src/lib-dict/dict-sql.c
+++ b/src/lib-dict/dict-sql.c
@@ -486,13 +486,15 @@ sql_dict_result_unescape(enum dict_sql_type type, pool_t pool,
 {
        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;
        }