1
0
mirror of https://gitlab.xiph.org/xiph/ezstream.git synced 2025-02-02 15:07:45 -05:00

Fix a crash when querying metadata program

Simple copy+paste mistake.
This commit is contained in:
Moritz Grimm 2020-09-02 22:20:51 +02:00
parent 9705838770
commit f1efd079d4
2 changed files with 7 additions and 5 deletions

3
NEWS
View File

@ -2,6 +2,9 @@ Changes in 1.0.2, released on XXXX-XX-XX:
* Fix a crash, if metadata placeholders are configured for input files
that do not contain the respective values. From gui-lux on Github (#16).
* Fix a crash in one instance of querying the metadata program. From taku0220
on Github (#23).
* Minor documentation tweak

View File

@ -605,19 +605,18 @@ streamFile(stream_t stream, const char *fileName)
continue;
if (cfg_get_metadata_program()) {
char *mdataStr = NULL;
mdata_t prog_md;
log_info("running metadata program: %s",
cfg_get_metadata_program());
prog_md = mdata_create();
md = mdata_create();
if (0 > mdata_run_program(md, cfg_get_metadata_program()) ||
0 > stream_set_metadata(stream, prog_md, &mdataStr)) {
mdata_destroy(&prog_md);
0 > stream_set_metadata(stream, md, &mdataStr)) {
mdata_destroy(&md);
retval = 0;
ret = STREAM_DONE;
continue;
}
mdata_destroy(&prog_md);
mdata_destroy(&md);
log_info("new metadata: %s", mdataStr);
xfree(mdataStr);
}