bluetooth: Free memblock after codec errors

[Version] 15.0-11
[Issue Type] Mainline patch

Change-Id: I4a484f99c92a9fff5e7427daf876e288b77e31fc
Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/628>

diff --git a/packaging/pulseaudio.spec b/packaging/pulseaudio.spec
index de5399d..541e7bb 100644 (file)
--- a/packaging/pulseaudio.spec
+++ b/packaging/pulseaudio.spec
@@ -4,7 +4,7 @@
 Name:             pulseaudio
 Summary:          Improved Linux sound server
 Version:          15.0
-Release:          10
+Release:          11
 Group:            Multimedia/Audio
 License:          LGPL-2.1
 URL:              http://pulseaudio.org

diff --git a/src/modules/bluetooth/module-bluez5-device.c b/src/modules/bluetooth/module-bluez5-device.c
index de6de97..4f8a28f 100644 (file)
--- a/src/modules/bluetooth/module-bluez5-device.c
+++ b/src/modules/bluetooth/module-bluez5-device.c
@@ -376,6 +376,8 @@ static int bt_process_render(struct userdata *u) {
 
     if (processed != u->write_memchunk.length) {
         pa_log_error("Encoding error");
+        pa_memblock_unref(u->write_memchunk.memblock);
+        pa_memchunk_reset(&u->write_memchunk);
         return -1;
     }
 
@@ -532,6 +534,7 @@ static int bt_process_push(struct userdata *u) {
         pa_log_error("Continuous decode error count [%3d/%3d]", decode_error_count, max_decode_error_count);
         decode_error_count = 0;
 #endif
+        pa_memblock_unref(memchunk.memblock);
         return -1;
     }
 #ifdef __TIZEN_BT__