bkp - Backported errata fixes

--- Taking fixes from BassBoom v0.2.4.2, we've fixed issues related to MPG123 dependencies. --- The following commits or tags are used for this backport: - 080533a [v0.2.4.2] --- Type: bkp Breaking: False Doc Required: False Backport Required: False Part: 1/1
Aptivi · Nov 6, 2024 · 01369f0 · 01369f0
1 parent c1d2f77
commit 01369f0
Show file tree

Hide file tree

Showing 13 changed files with 8 additions and 4 deletions.
diff --git a/BassBoom.Native/MpgNative.cs b/BassBoom.Native/MpgNative.cs
@@ -37,6 +37,7 @@ internal static unsafe class MpgNative
     {
         internal static string mpg123LibPath = GetLibPath("mpg123");
         internal static string out123LibPath = GetLibPath("out123");
+        internal static string pthreadLibPath = GetLibPath("libwinpthread-1");
 
         internal static mpg123_handle* _mpg123Handle;
         internal static out123_handle* _out123Handle;
@@ -122,7 +123,10 @@ internal static void InitializeLibrary(string libPath, string libPathOut)
             if (architecture == Architecture.X86 || architecture == Architecture.Arm)
                 throw new BasoliaNativeLibraryException("32-bit platforms are no longer supported.");
             libManagerMpg = new LibraryManager(new LibraryFile(mpg123LibPath));
-            libManagerOut = new LibraryManager(new LibraryFile(out123LibPath));
+            libManagerOut = new LibraryManager(
+                architecture == Architecture.X64 && PlatformHelper.IsOnWindows() ?
+                [new LibraryFile(pthreadLibPath), new LibraryFile(out123LibPath)] :
+                [new LibraryFile(out123LibPath)]);
             libManagerMpg.LoadNativeLibrary();
             libManagerOut.LoadNativeLibrary();
 

diff --git a/BassBoom.Native/runtimes/win-x64/native/libwinpthread-1.dll b/BassBoom.Native/runtimes/win-x64/native/libwinpthread-1.dll
diff --git a/BassBoom.Native/runtimes/win-x64/native/mpg123.dll b/BassBoom.Native/runtimes/win-x64/native/mpg123.dll
diff --git a/BassBoom.Native/runtimes/win-x64/native/out123.dll b/BassBoom.Native/runtimes/win-x64/native/out123.dll
diff --git a/BassBoom.Native/runtimes/win-x64/native/plugins/output_dummy.dll b/BassBoom.Native/runtimes/win-x64/native/plugins/output_dummy.dll
diff --git a/BassBoom.Native/runtimes/win-x64/native/plugins/output_openal.dll b/BassBoom.Native/runtimes/win-x64/native/plugins/output_openal.dll
diff --git a/BassBoom.Native/runtimes/win-x64/native/plugins/output_portaudio.dll b/BassBoom.Native/runtimes/win-x64/native/plugins/output_portaudio.dll
diff --git a/BassBoom.Native/runtimes/win-x64/native/plugins/output_sdl.dll b/BassBoom.Native/runtimes/win-x64/native/plugins/output_sdl.dll
diff --git a/BassBoom.Native/runtimes/win-x64/native/plugins/output_win32.dll b/BassBoom.Native/runtimes/win-x64/native/plugins/output_win32.dll
diff --git a/BassBoom.Native/runtimes/win-x64/native/plugins/output_win32_wasapi.dll b/BassBoom.Native/runtimes/win-x64/native/plugins/output_win32_wasapi.dll
diff --git a/CHANGES b/CHANGES
@@ -1,4 +1,4 @@
-BassBoom is now more secure by fixing a security issue pertaining to MPG123!
+(Errata release) We've updated MPG123 to version 1.32.9 as there was a security vulnerability that was fixed.
 
 ### Changes
 

diff --git a/CHANGES.TITLE b/CHANGES.TITLE
@@ -1 +1 @@
-[servicing] BassBoom v0.1.10: More Secure!
+[servicing] BassBoom v0.1.10.1: More Secure!
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
     <PropertyGroup>
-        <Version>0.1.10</Version>
+        <Version>0.1.10.1</Version>
         <Authors>Aptivi</Authors>
         <Company>Aptivi</Company>
         <Copyright>Copyright (c) 2021-2024 Aptivi</Copyright>