From ee7e63d1dca36663fa7d5400584355dab756b90f Mon Sep 17 00:00:00 2001
From: Alexander Capehart <alex@oxycblt.org>
Date: Fri, 31 Jan 2025 13:41:23 -0700
Subject: [PATCH] musikr: stop possible use-after-free in metabuild

---
 musikr/src/main/cpp/JMetadataBuilder.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/musikr/src/main/cpp/JMetadataBuilder.cpp b/musikr/src/main/cpp/JMetadataBuilder.cpp
index f7aa61457..0e7dc14c3 100644
--- a/musikr/src/main/cpp/JMetadataBuilder.cpp
+++ b/musikr/src/main/cpp/JMetadataBuilder.cpp
@@ -208,8 +208,9 @@ jobject JMetadataBuilder::build() {
     auto jMp4Map = mp4.getObject();
     if (cover.has_value()) {
         JByteArrayRef jCoverArray { env, cover.value() };
-        return env->NewObject(*jMetadataClass, jMetadataInitMethod, **jId3v2Map,
+        jobject result = env->NewObject(*jMetadataClass, jMetadataInitMethod, **jId3v2Map,
                 **jXiphMap, **jMp4Map, *jCoverArray, *jProperties);
+        return result;
     }
     return env->NewObject(*jMetadataClass, jMetadataInitMethod, **jId3v2Map,
             **jXiphMap, **jMp4Map, nullptr, *jProperties);