From 107fd941cd688593feaf6e4231abb467a7681040 Mon Sep 17 00:00:00 2001
From: "Ryan C. Gordon" <icculus@icculus.org>
Date: Fri, 21 Jul 2023 10:56:28 -0400
Subject: [PATCH] vitaaudio: Clean up correctly in CloseDevice.

---
 src/audio/vita/SDL_vitaaudio.c | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/audio/vita/SDL_vitaaudio.c b/src/audio/vita/SDL_vitaaudio.c
index 314f42302..7e52ceef6 100644
--- a/src/audio/vita/SDL_vitaaudio.c
+++ b/src/audio/vita/SDL_vitaaudio.c
@@ -148,25 +148,29 @@ static void VITAAUD_WaitDevice(SDL_AudioDevice *device)
     }
 }
 
-static Uint8 *VITAAUD_GetDeviceBuf(SDL_AudioDevice *device)
+static Uint8 *VITAAUD_GetDeviceBuf(SDL_AudioDevice *device, int *buffer_size)
 {
     return device->hidden->mixbufs[device->hidden->next_buffer];
 }
 
 static void VITAAUD_CloseDevice(SDL_AudioDevice *device)
 {
-    if (device->hidden->port >= 0) {
-        if (device->iscapture) {
-            sceAudioInReleasePort(device->hidden->port);
-        } else {
-            sceAudioOutReleasePort(device->hidden->port);
+    if (device->hidden) {
+        if (device->hidden->port >= 0) {
+            if (device->iscapture) {
+                sceAudioInReleasePort(device->hidden->port);
+            } else {
+                sceAudioOutReleasePort(device->hidden->port);
+            }
+            device->hidden->port = -1;
         }
-        device->hidden->port = -1;
-    }
 
-    if (!device->iscapture && device->hidden->rawbuf != NULL) {
-        SDL_aligned_free(device->hidden->rawbuf);
-        device->hidden->rawbuf = NULL;
+        if (!device->iscapture && device->hidden->rawbuf != NULL) {
+            SDL_aligned_free(device->hidden->rawbuf); // this uses memalign(), not SDL_malloc().
+            device->hidden->rawbuf = NULL;
+        }
+        SDL_free(device->hidden);
+        device->hidden = NULL;
     }
 }