From: Andre Noll <maan@tuebingen.mpg.de>
Date: Fri, 13 Aug 2021 19:47:47 +0000 (+0200)
Subject: aac_afh: Fix check of return value of mp4ff_meta_update().
X-Git-Tag: v0.6.4~16
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=5349f35b026544d410feba55c846ac39e80de9ad;hp=d6a87acd98b9e451d488e31b92cdae7673c30ac6

aac_afh: Fix check of return value of mp4ff_meta_update().

This function returns zero on failure, and one on success, so the
current check for a negative return value is incorrect. The call to
mp4ff_meta_get_by_index() suffers from the same mistake.
---

diff --git a/aac_afh.c b/aac_afh.c
index 7f2a22a2..2b3dd2cc 100644
--- a/aac_afh.c
+++ b/aac_afh.c
@@ -292,8 +292,7 @@ static int aac_afh_rewrite_tags(const char *map, size_t mapsize,
 		mp4ff_tag_t *tag = metadata.tags + i;
 
 		ret = -E_MP4FF_META_READ;
-		if (mp4ff_meta_get_by_index(mp4ff, i,
-				&tag->item, &tag->value) < 0)
+		if (!mp4ff_meta_get_by_index(mp4ff, i, &tag->item, &tag->value))
 			goto free_tags;
 		PARA_INFO_LOG("found: %s: %s\n", tag->item, tag->value);
 		if (!strcmp(tag->item, "artist"))
@@ -318,7 +317,7 @@ static int aac_afh_rewrite_tags(const char *map, size_t mapsize,
 	if (!found_comment)
 		add_tag(&metadata, "comment", tags->comment);
 	ret = -E_MP4FF_META_WRITE;
-	if (mp4ff_meta_update(&cb, &metadata) < 0)
+	if (!mp4ff_meta_update(&cb, &metadata))
 		goto free_tags;
 	ret = 1;
 free_tags: