pulseaudio: fix PaPulseAudio_Initialize unlocking

Make sure that if PaPulseAudio_Initialize fails that a) Mainloop is unlocked if HostAPI is initialized b) Unlocking is done before freeing c) It's done only once Also move allocations group freeing code to correct place now there only one place where it's called
illuusio · Oct 24, 2023 · f6fbdfb · f6fbdfb
1 parent 24c8d57
commit f6fbdfb
Showing 1 changed file with 14 additions and 13 deletions.
diff --git a/src/hostapi/pulseaudio/pa_linux_pulseaudio.c b/src/hostapi/pulseaudio/pa_linux_pulseaudio.c
@@ -211,13 +211,19 @@ void PaPulseAudio_Free( PaPulseAudio_HostApiRepresentation * ptr )
         ptr->timeEvent = NULL;
     }
 
-
     if( ptr->mainloop )
     {
         pa_threaded_mainloop_free( ptr->mainloop );
         ptr->mainloop = NULL;
     }
 
+    if( ptr->allocations )
+    {
+        PaUtil_FreeAllAllocations( ptr->allocations );
+        PaUtil_DestroyAllocationGroup( ptr->allocations );
+        ptr->allocations = NULL;
+    }
+
     PaUtil_FreeMemory( ptr );
 }
 
@@ -529,6 +535,7 @@ PaError PaPulseAudio_Initialize( PaUtilHostApiRepresentation ** hostApi,
     int i;
     int deviceCount;
     int ret = 0;
+    int lockTaken = 0;
     PaPulseAudio_HostApiRepresentation *pulseaudioHostApi = NULL;
     PaDeviceInfo *deviceInfoArray = NULL;
 
@@ -561,6 +568,8 @@ PaError PaPulseAudio_Initialize( PaUtilHostApiRepresentation ** hostApi,
 
     /* Connect to server */
     PaPulseAudio_Lock( pulseaudioHostApi->mainloop );
+    lockTaken = 1;
+
     ret = pa_context_connect( pulseaudioHostApi->context,
                                  NULL,
                                  0,
@@ -570,8 +579,7 @@ PaError PaPulseAudio_Initialize( PaUtilHostApiRepresentation ** hostApi,
     {
         PA_PULSEAUDIO_SET_LAST_HOST_ERROR( 0,
                                            "PulseAudio_Initialize: Can't connect to server");
-        result = paNotInitialized;
-        PaPulseAudio_UnLock( pulseaudioHostApi->mainloop );
+        result = paUnanticipatedHostError;
         goto error;
     }
 
@@ -589,6 +597,7 @@ PaError PaPulseAudio_Initialize( PaUtilHostApiRepresentation ** hostApi,
                 break;
             case PA_CONTEXT_TERMINATED:
             case PA_CONTEXT_FAILED:
+                result = paUnanticipatedHostError;
                 goto error;
                 break;
             case PA_CONTEXT_UNCONNECTED:
@@ -748,12 +757,10 @@ PaError PaPulseAudio_Initialize( PaUtilHostApiRepresentation ** hostApi,
 
     if( pulseaudioHostApi )
     {
-        if( pulseaudioHostApi->allocations )
+        if( lockTaken )
         {
-            PaUtil_FreeAllAllocations( pulseaudioHostApi->allocations );
-            PaUtil_DestroyAllocationGroup( pulseaudioHostApi->allocations );
+            PaPulseAudio_UnLock( pulseaudioHostApi->mainloop );
         }
-
         PaPulseAudio_Free( pulseaudioHostApi );
         pulseaudioHostApi = NULL;
     }
@@ -767,12 +774,6 @@ void Terminate( struct PaUtilHostApiRepresentation *hostApi )
     PaPulseAudio_HostApiRepresentation *pulseaudioHostApi =
         (PaPulseAudio_HostApiRepresentation *) hostApi;
 
-    if( pulseaudioHostApi->allocations )
-    {
-        PaUtil_FreeAllAllocations( pulseaudioHostApi->allocations );
-        PaUtil_DestroyAllocationGroup( pulseaudioHostApi->allocations );
-    }
-
     PaPulseAudio_Lock( pulseaudioHostApi->mainloop );
     pa_context_disconnect( pulseaudioHostApi->context );
     PaPulseAudio_UnLock( pulseaudioHostApi->mainloop );