mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-05 13:29:57 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli: Fix crash when using .include with an empty directory

Browse source 
This would previously fail the size > 0 assertion in pa_xmalloc.

Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/454>
This commit is contained in:
Patrick Gaskin 2021-01-03 03:29:35 -05:00 • committed by PulseAudio Marge Bot
parent c2ae56a73c
commit b1bdd27a6c
1 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

44
src/pulsecore/cli-command.c
View file

@ -2118,34 +2118,34 @@ int pa_cli_command_execute_line_stateful(pa_core *c, const char *s, pa_strbuf *b
} }
closedir(d); closedir(d);
if ((count = pa_dynarray_size(files))) {
sorted_files = pa_xnew(char*, count);
for (i = 0; i < count; ++i)
sorted_files[i] = pa_dynarray_get(files, i);
pa_dynarray_free(files);
count = pa_dynarray_size(files); for (i = 0; i < count; ++i) {
sorted_files = pa_xnew(char*, count); for (unsigned j = 0; j < count; ++j) {
for (i = 0; i < count; ++i) if (strcmp(sorted_files[i], sorted_files[j]) < 0) {
sorted_files[i] = pa_dynarray_get(files, i); char *tmp = sorted_files[i];
pa_dynarray_free(files); sorted_files[i] = sorted_files[j];
sorted_files[j] = tmp;
for (i = 0; i < count; ++i) { }
for (unsigned j = 0; j < count; ++j) {
if (strcmp(sorted_files[i], sorted_files[j]) < 0) {
char *tmp = sorted_files[i];
sorted_files[i] = sorted_files[j];
sorted_files[j] = tmp;
} }
} }
}
for (i = 0; i < count; ++i) { for (i = 0; i < count; ++i) {
if (!failed) { if (!failed) {
if (pa_cli_command_execute_file(c, sorted_files[i], buf, fail) < 0 && *fail) if (pa_cli_command_execute_file(c, sorted_files[i], buf, fail) < 0 && *fail)
failed = true; failed = true;
}
pa_xfree(sorted_files[i]);
} }
pa_xfree(sorted_files);
pa_xfree(sorted_files[i]); if (failed)
return -1;
} }
pa_xfree(sorted_files);
if (failed)
return -1;
} }
} else if (pa_cli_command_execute_file(c, filename, buf, fail) < 0 && *fail) { } else if (pa_cli_command_execute_file(c, filename, buf, fail) < 0 && *fail) {
return -1; return -1;