lib-storage: Don't ignore uni_utf8_get_valid_data() return value

It's not supposed to happen, so call i_unreached()
dovecot · Apr 26, 2018 · 3916381 · 3916381
1 parent dd1efd7
commit 3916381
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/lib-storage/list/mailbox-list-fs-iter.c b/src/lib-storage/list/mailbox-list-fs-iter.c
@@ -111,8 +111,9 @@ fs_list_rename_invalid(struct fs_list_iterate_context *ctx,
 					  MAILBOX_LIST_PATH_TYPE_MAILBOX);
 	src = t_strconcat(root, "/", storage_name, NULL);
 
-	(void)uni_utf8_get_valid_data((const void *)storage_name,
-				      strlen(storage_name), destname);
+	if (uni_utf8_get_valid_data((const void *)storage_name,
+				    strlen(storage_name), destname))
+		i_unreached(); /* already checked that it was invalid */
 
 	str_append(dest, root);
 	str_append_c(dest, '/');

diff --git a/src/lib-storage/list/mailbox-list-maildir-iter.c b/src/lib-storage/list/mailbox-list-maildir-iter.c
@@ -300,8 +300,9 @@ maildir_fill_readdir_entry(struct maildir_list_iterate_context *ctx,
 		string_t *destvname = t_str_new(128);
 		string_t *dest = t_str_new(128);
 
-		(void)uni_utf8_get_valid_data((const void *)fname,
-					      strlen(fname), destvname);
+		if (uni_utf8_get_valid_data((const void *)fname,
+					    strlen(fname), destvname))
+			i_unreached(); /* already checked that it was invalid */
 
 		str_append(dest, ctx->dir);
 		str_append_c(dest, '/');