Fix crash in native getPictures when there are multiple pictures in a…

… song
Kyant0 · Mar 15, 2024 · a38e3e9 · a38e3e9
1 parent f5e4ccc
commit a38e3e9
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 8 deletions.
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,9 +1,9 @@
 [versions]
-agp = "8.4.0-alpha06"
+agp = "8.4.0-alpha13"
 android-minSdk = "21"
 android-compileSdk = "34"
-lib-version = "1.0.0-alpha01"
-kotlin = "1.9.22"
+lib-version = "1.0.0-alpha02"
+kotlin = "1.9.23"
 rules = "1.5.0"
 runner = "1.5.2"
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
-#Thu Jan 25 14:29:12 CST 2024
+#Fri Mar 15 19:10:01 CST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-rc-3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/src/androidTest/assets/multiple_album_art.flac b/src/androidTest/assets/multiple_album_art.flac
diff --git a/src/androidTest/kotlin/Tests.kt b/src/androidTest/kotlin/Tests.kt
@@ -48,6 +48,13 @@ class Tests {
             val pictures = TagLib.getPictures(fd.dup().detachFd(), flacFileName)!!
             Assert.assertEquals(42716, pictures[0].data.size)
         }
+
+        val multipleAlbumArtFileName = "multiple_album_art.flac"
+        getFdFromAssets(context, multipleAlbumArtFileName).use { fd ->
+            val pictures = TagLib.getPictures(fd.dup().detachFd(), flacFileName)!!
+            Assert.assertEquals(3, pictures.size)
+            Assert.assertEquals(29766, pictures[2].data.size)
+        }
     }
 
     private fun getFdFromAssets(

diff --git a/src/main/cpp/taglib.cpp b/src/main/cpp/taglib.cpp
@@ -302,6 +302,7 @@ Java_com_kyant_taglib_TagLib_getPictures(
         return nullptr;
     }
 
+    auto pictureIndex = 0;
     jobjectArray pictureArray = env->NewObjectArray(pictures.size(), pictureClass, nullptr);
     for (const auto &picture: pictures) {
         auto pictureData = picture.value("data").toByteVector();
@@ -330,8 +331,9 @@ Java_com_kyant_taglib_TagLib_getPictures(
         env->DeleteLocalRef(jDescription);
         env->DeleteLocalRef(jPictureType);
         env->DeleteLocalRef(jMimeType);
-        env->SetObjectArrayElement(pictureArray, static_cast<jsize>(&picture - &pictures[0]), pictureObject);
+        env->SetObjectArrayElement(pictureArray, pictureIndex, pictureObject);
         env->DeleteLocalRef(pictureObject);
+        pictureIndex++;
     }
 
     return pictureArray;