From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Fri, 6 Oct 2017 12:54:47 +0000 (+0300)
Subject: dict-sql: dict doesn't support NULL values, so convert SQL NULLs to ""
X-Git-Tag: 2.3.0.rc1~868
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6781f16b21fb66a196130135bfef53488e7b913b;p=thirdparty%2Fdovecot%2Fcore.git

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

diff --git a/src/lib-dict-backend/dict-sql.c b/src/lib-dict-backend/dict-sql.c
index a49c07b93b..6b11c3d0e1 100644
--- a/src/lib-dict-backend/dict-sql.c
+++ b/src/lib-dict-backend/dict-sql.c
@@ -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;
 	}