]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
dict-sql: dict doesn't support NULL values, so convert SQL NULLs to ""
authorTimo Sirainen <timo.sirainen@dovecot.fi>
Fri, 6 Oct 2017 12:54:47 +0000 (15:54 +0300)
committerTimo Sirainen <tss@dovecot.fi>
Fri, 6 Oct 2017 14:21:16 +0000 (17:21 +0300)
src/lib-dict-backend/dict-sql.c

index a49c07b93b444b44ea3924f9383d663e3ef94741..6b11c3d0e1bc29d38a7f6287546f4c35d7231f59 100644 (file)
@@ -472,13 +472,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;
        }