fix Android: crashes after opus stream playback #365

Author: alnitak

CHANGELOG.md

@@ -1,4 +1,7 @@
 
+#### 3.4.3 (XX Xxx 2025)
+- fix Android: crashes after opus stream playback #365
+
 #### 3.4.2 (8 Nov 2025)
 - fix Android: NO_OPUS_OGG_LIBS for Android build used in `gradle.properties` not always worked #358. And Thanks to @mingjunsiek #361 #354
 - fix: memory leak in FlutterSoLoudFfi.addAudioDataStream #359. Thanks to @DarthRainbows

example/macos/Podfile.lock

@@ -0,0 +1,41 @@
+PODS:
+  - audio_session (0.0.1):
+    - FlutterMacOS
+  - file_picker (0.0.1):
+    - FlutterMacOS
+  - flutter_soloud (0.0.1):
+    - FlutterMacOS
+  - FlutterMacOS (1.0.0)
+  - path_provider_foundation (0.0.1):
+    - Flutter
+    - FlutterMacOS
+
+DEPENDENCIES:
+  - audio_session (from `Flutter/ephemeral/.symlinks/plugins/audio_session/macos`)
+  - file_picker (from `Flutter/ephemeral/.symlinks/plugins/file_picker/macos`)
+  - flutter_soloud (from `Flutter/ephemeral/.symlinks/plugins/flutter_soloud/macos`)
+  - FlutterMacOS (from `Flutter/ephemeral`)
+  - path_provider_foundation (from `Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin`)
+
+EXTERNAL SOURCES:
+  audio_session:
+    :path: Flutter/ephemeral/.symlinks/plugins/audio_session/macos
+  file_picker:
+    :path: Flutter/ephemeral/.symlinks/plugins/file_picker/macos
+  flutter_soloud:
+    :path: Flutter/ephemeral/.symlinks/plugins/flutter_soloud/macos
+  FlutterMacOS:
+    :path: Flutter/ephemeral
+  path_provider_foundation:
+    :path: Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin
+
+SPEC CHECKSUMS:
+  audio_session: eaca2512cf2b39212d724f35d11f46180ad3a33e
+  file_picker: 7584aae6fa07a041af2b36a2655122d42f578c1a
+  flutter_soloud: 93c20641a100d25bfbc84a8b86e867f350ef29ac
+  FlutterMacOS: d0db08ddef1a9af05a5ec4b724367152bb0500b1
+  path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
+
+PODFILE CHECKSUM: 5e895c4e74302f01a7051c77c78271c4826bc78a
+
+COCOAPODS: 1.16.2

pubspec.yaml

@@ -3,7 +3,7 @@ description: >-
   A low-level audio plugin for Flutter,
   mainly meant for games and immersive apps.
   Based on the SoLoud (C++) audio engine.
-version: 3.4.2
+version: 3.4.3
 homepage: https://github.com/alnitak/flutter_soloud
 maintainer: Marco Bavagnoli (@lildeimos)
 platforms:

src/audiobuffer/audiobuffer.cpp

@@ -71,10 +71,14 @@ namespace SoLoud
 
 		unsigned int bufferSize = mParent->mBuffer.getFloatsBufferSize();
 		float *buffer = reinterpret_cast<float *>(mParent->mBuffer.buffer.data());
-		int samplesToRead = mOffset + aSamplesToRead > bufferSize ? bufferSize - mOffset : aSamplesToRead;
+		int samplesToRead = aSamplesToRead;
+		if (mOffset + (unsigned int)samplesToRead * mChannels > bufferSize)
+		{
+			samplesToRead = (bufferSize - mOffset) / mChannels;
+		}
 		if (samplesToRead <= 0)
 		{
-			memset(aBuffer, 0, sizeof(float) * aSamplesToRead);
+			memset(aBuffer, 0, sizeof(float) * aSamplesToRead * mChannels);
 			// Calculate mStreamPosition based on mOffset
 			mStreamPosition = mOffset / (float)(mBaseSamplerate * mChannels);
 
@@ -92,7 +96,7 @@ namespace SoLoud
 
 		if (samplesToRead != aSamplesToRead)
 		{
-			memset(aBuffer, 0, sizeof(float) * aSamplesToRead);
+			memset(aBuffer, 0, sizeof(float) * aSamplesToRead * mChannels);
 		}
 
 		if (mChannels == 1)
@@ -110,7 +114,7 @@ namespace SoLoud
 			{
 				for (i = 0; i < samplesToRead; i++)
 				{
-					aBuffer[j * samplesToRead + i] = buffer[mOffset + i * mChannels + j];
+					aBuffer[j * aSamplesToRead + i] = buffer[mOffset + i * mChannels + j];
 				}
 			}
 		}