Mercurial > dovecot > core-2.2

changeset 9056:40b5b098817b HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dict-sql: Don't crash if iteration sees a NULL value in path.
author Timo Sirainen <tss@iki.fi>
date Thu, 09 Apr 2009 19:31:22 -0400
parents af9ac89e0910
children c1b201243d52
files src/lib-dict/dict-sql.c
diffstat 1 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib-dict/dict-sql.c	Thu Apr 09 19:14:23 2009 -0400
+++ b/src/lib-dict/dict-sql.c	Thu Apr 09 19:31:22 2009 -0400
@@ -395,7 +395,7 @@
 {
 	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 @@
 			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++;
 		}
 	}