We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Dont assign the context patch.

sdl_pulse_assign_context.patch (text/plain), 2.27 KB, created by Alistair Leslie-Hughes on 2020-08-14 03:26:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alistair Leslie-Hughes

Created: 2020-08-14 03:26:12 UTC

Size: 2.27 KB

patch

obsolete

># HG changeset patch
># User Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
># Date 1597370938 -36000
>#      Fri Aug 14 12:08:58 2020 +1000
># Node ID 7a0871133c610cef912ec60a74ed73bd8a60efd3
># Parent  369fea16825855455a7e6ec3d65eab1518986222
>Only assign context and mainloop once we have connected successfully
>
>If we fail to connect to the the pa server, we have an assigned context
>and mainloop that isn't connected. So, when PULSEAUDIO_pa_context_disconnect
>is called, pa asserts and crashes the application.
>
>Assertion 'pa_atomic_load(&(c)->_ref) >= 1' failed at pulse/context.c:1055, function pa_context_disconnect(). Aborting.
>
>diff -r 369fea168258 -r 7a0871133c61 src/audio/pulseaudio/SDL_pulseaudio.c
>--- a/src/audio/pulseaudio/SDL_pulseaudio.c	Tue Jul 21 23:38:42 2020 +0200
>+++ b/src/audio/pulseaudio/SDL_pulseaudio.c	Fri Aug 14 12:08:58 2020 +1000
>@@ -295,32 +295,39 @@
>         return SDL_SetError("pa_mainloop_new() failed");
>     }
> 
>-    *_mainloop = mainloop;
>-
>     mainloop_api = PULSEAUDIO_pa_mainloop_get_api(mainloop);
>     SDL_assert(mainloop_api);  /* this never fails, right? */
> 
>     context = PULSEAUDIO_pa_context_new(mainloop_api, getAppName());
>     if (!context) {
>+        PULSEAUDIO_pa_mainloop_free(mainloop);
>         return SDL_SetError("pa_context_new() failed");
>     }
>-    *_context = context;
> 
>     /* Connect to the PulseAudio server */
>     if (PULSEAUDIO_pa_context_connect(context, NULL, 0, NULL) < 0) {
>+        PULSEAUDIO_pa_context_unref(context);
>+        PULSEAUDIO_pa_mainloop_free(mainloop);
>         return SDL_SetError("Could not setup connection to PulseAudio");
>     }
> 
>     do {
>         if (PULSEAUDIO_pa_mainloop_iterate(mainloop, 1, NULL) < 0) {
>+            PULSEAUDIO_pa_context_unref(context);
>+            PULSEAUDIO_pa_mainloop_free(mainloop);
>             return SDL_SetError("pa_mainloop_iterate() failed");
>         }
>         state = PULSEAUDIO_pa_context_get_state(context);
>         if (!PA_CONTEXT_IS_GOOD(state)) {
>+            PULSEAUDIO_pa_context_unref(context);
>+            PULSEAUDIO_pa_mainloop_free(mainloop);
>             return SDL_SetError("Could not connect to PulseAudio");
>         }
>     } while (state != PA_CONTEXT_READY);
> 
>+    *_context = context;
>+    *_mainloop = mainloop;
>+
>     return 0;  /* connected and ready! */
> }
>

Actions: View | Diff

Attachments on bug 5256: 4436

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.