From 581d26de766276619cd719021a35ccac43206b72 Mon Sep 17 00:00:00 2001
From: Andre Noll <maan@tuebingen.mpg.de>
Date: Sun, 6 Aug 2017 15:13:04 +0200
Subject: [PATCH 1/1] wma_afh: Add some assert() statements.

The clang static analyzer seems to have a hard time proving that if
convert_utf8_to_utf16() returns non-negative, the destination pointer
is non-null. This patch should help it.
---
 wma_afh.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/wma_afh.c b/wma_afh.c
index ebb2f9c3..01674f1a 100644
--- a/wma_afh.c
+++ b/wma_afh.c
@@ -377,14 +377,17 @@ static int make_cdo(struct taginfo *tags, const struct asf_object *cdo,
 	ret = convert_utf8_to_utf16(tags->artist, &artist);
 	if (ret < 0)
 		return ret;
+	assert(artist);
 	artist_bytes = ret;
 	ret = convert_utf8_to_utf16(tags->title, &title);
 	if (ret < 0)
 		goto out;
+	assert(title);
 	title_bytes = ret;
 	ret = convert_utf8_to_utf16(tags->comment, &comment);
 	if (ret < 0)
 		goto out;
+	assert(comment);
 	comment_bytes = ret;
 
 	if (cdo) {
@@ -458,10 +461,12 @@ static int make_ecdo(struct taginfo *tags, struct asf_object *result)
 	ret = convert_utf8_to_utf16(tags->album, &album);
 	if (ret < 0)
 		return ret;
+	assert(album);
 	album_bytes = ret;
 	ret = convert_utf8_to_utf16(tags->year, &year);
 	if (ret < 0)
 		goto out;
+	assert(year);
 	year_bytes = ret;
 	result->size = 16 + 8 + 2; /* GUID, size, count */
 	/* name_length + name + null + data type + val length + val */
-- 
2.30.2