From 3892773bd7d9b070d2a07795c77e42c83bae3240 Mon Sep 17 00:00:00 2001
From: mojyack <mojyack@gmail.com>
Date: Tue, 16 Dec 2025 04:27:43 +0900
Subject: [PATCH] playlist: fix deadlock when calling playlist_restore() on
 certain timing

for example:
<audio> audio_thread
<audio> -audio_playback_handler
<audio> --audio_start_playback
<audio> ---audio_fill_file_buffer
<audio> ----playlist_peek
<main>  -playlist_resume { playlist_write_lock(playlist) }
<main>  --alloc_tempbuf
<main>  ---core_alloc_ex
<main>  ----buflib_alloc_ex
<main>  -----buflib_compact_and_shrink
<main>  ------playback.c:shrink_callback
<main>  -------audio_queue_send(Q_AUDIO_STOP)
<main>  (waiting for audio queue reply)
<audio> -----get_track_filename { playlist_write_lock(playlist) }
<audio> (waiting for playlist lock)

resolve this by not locking playlist until temporary buffer is allocated

Change-Id: I55a856780d17455b13e2515e096095ae0e9c86c2
---
 apps/playlist.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/playlist.c b/apps/playlist.c
index b004d46b40..c818937677 100644
--- a/apps/playlist.c
+++ b/apps/playlist.c
@@ -3159,7 +3159,6 @@ int playlist_resume(void)
 
     struct playlist_info* playlist = &current_playlist;
     dc_thread_stop(playlist);
-    playlist_write_lock(playlist);
 
     if (core_allocatable() < (1 << 10))
         talk_buffer_set_policy(TALK_BUFFER_LOOSE); /* back off voice buffer */
@@ -3172,9 +3171,11 @@ int playlist_resume(void)
     if (handle < 0)
     {
         splashf(HZ * 2, "%s(): OOM", __func__);
-        goto out;
+        return -1;
     }
 
+    playlist_write_lock(playlist);
+
     /* align buffer for faster load times */
     buffer = core_get_data(handle);
     STORAGE_ALIGN_BUFFER(buffer, buflen);