From dbd0e4bdade17c60769642c13f1632002135971e Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Thu, 9 Apr 2009 19:31:22 -0400 Subject: [PATCH] dict-sql: Don't crash if iteration sees a NULL value in path. --HG-- branch : HEAD --- src/lib-dict/dict-sql.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/lib-dict/dict-sql.c b/src/lib-dict/dict-sql.c index 1260e4b441..8475047ca8 100644 --- a/src/lib-dict/dict-sql.c +++ b/src/lib-dict/dict-sql.c @@ -395,7 +395,7 @@ static int sql_dict_iterate(struct dict_iterate_context *_ctx, { struct sql_dict_iterate_context *ctx = (struct sql_dict_iterate_context *)_ctx; - const char *p; + const char *p, *value; unsigned int i, count; int ret; @@ -426,8 +426,9 @@ static int sql_dict_iterate(struct dict_iterate_context *_ctx, str_append_c(ctx->key, *p); else { i_assert(i < count); - str_append(ctx->key, - sql_result_get_field_value(ctx->result, i)); + value = sql_result_get_field_value(ctx->result, i); + if (value != NULL) + str_append(ctx->key, value); i++; } } -- 2.47.3