49 lines
1.7 KiB
Diff
49 lines
1.7 KiB
Diff
From d53adf0ba12761fa690ce1b8e1d4f85dc961338d Mon Sep 17 00:00:00 2001
|
|
From: Wim Taymans <wtaymans@redhat.com>
|
|
Date: Thu, 25 Mar 2021 15:33:18 +0100
|
|
Subject: [PATCH 10/10] pulse-server: avoid returning NULL strings
|
|
|
|
Don't return a NULL string when converting an id to a string because
|
|
some callers don't expect this and crash.
|
|
---
|
|
src/modules/module-protocol-pulse/format.c | 9 ++++++---
|
|
1 file changed, 6 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/src/modules/module-protocol-pulse/format.c b/src/modules/module-protocol-pulse/format.c
|
|
index 33d8ffb48..f4424cd3f 100644
|
|
--- a/src/modules/module-protocol-pulse/format.c
|
|
+++ b/src/modules/module-protocol-pulse/format.c
|
|
@@ -129,7 +129,8 @@ static inline const char *format_id2paname(uint32_t id)
|
|
{
|
|
size_t i;
|
|
for (i = 0; i < SPA_N_ELEMENTS(audio_formats); i++) {
|
|
- if (id == audio_formats[i].id)
|
|
+ if (id == audio_formats[i].id &&
|
|
+ audio_formats[i].name != NULL)
|
|
return audio_formats[i].name;
|
|
}
|
|
return "invalid";
|
|
@@ -371,7 +372,8 @@ static inline const char *channel_id2paname(uint32_t id, uint32_t *aux)
|
|
{
|
|
size_t i;
|
|
for (i = 0; i < SPA_N_ELEMENTS(audio_channels); i++) {
|
|
- if (id == audio_channels[i].channel)
|
|
+ if (id == audio_channels[i].channel &&
|
|
+ audio_channels[i].name != NULL)
|
|
return audio_channels[i].name;
|
|
}
|
|
return audio_channels[CHANNEL_POSITION_AUX0 + (*aux)++].name;
|
|
@@ -512,7 +514,8 @@ static const char *encoding_names[] = {
|
|
|
|
static inline const char *format_encoding2name(enum encoding enc)
|
|
{
|
|
- if (enc >= 0 && enc < (int)SPA_N_ELEMENTS(encoding_names))
|
|
+ if (enc >= 0 && enc < (int)SPA_N_ELEMENTS(encoding_names) &&
|
|
+ encoding_names[enc] != NULL)
|
|
return encoding_names[enc];
|
|
return "INVALID";
|
|
}
|
|
--
|
|
2.26.3
|
|
|