| Message ID | 1414323983-15996-2-git-send-email-tskd08@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Em Sun, 26 Oct 2014 20:46:17 +0900 tskd08@gmail.com escreveu: > From: Akihiro Tsukada <tskd08@gmail.com> > > when channel name was not available, it was generated from unset variables, > and leaked memory. > --- > lib/libdvbv5/dvb-file.c | 28 +++++++++++++++++++--------- > 1 file changed, 19 insertions(+), 9 deletions(-) > > diff --git a/lib/libdvbv5/dvb-file.c b/lib/libdvbv5/dvb-file.c > index 27d9a63..1ea14c4 100644 > --- a/lib/libdvbv5/dvb-file.c > +++ b/lib/libdvbv5/dvb-file.c > @@ -1121,20 +1121,23 @@ static int get_program_and_store(struct dvb_v5_fe_parms_priv *parms, > if (rc) > dvb_logerr("Couldn't get frontend props"); > } > + for (j = 0; j < parms->n_props; j++) { > + entry->props[j].cmd = parms->dvb_prop[j].cmd; > + entry->props[j].u.data = parms->dvb_prop[j].u.data; > + > + if (!*channel) > + freq = entry->props[j].u.data; This should actually be: if (!*channel && entry->props[j].cmd == DTV_FREQUENCY) freq = parms->dvb_prop[j].u.data; As, otherwise, you could be using some random property as "freq". Except for that, the rest seems to be ok on this patch. I'll fix it and apply the patch. Regards, Mauro > + } > if (!*channel) { > - r = asprintf(&channel, "%.2fMHz#%d", freq/1000000., service_id); > + free(channel); > + r = asprintf(&channel, "%.2f%cHz#%d", freq / 1000000., > + dvb_fe_is_satellite(parms->p.current_sys) ? 'G' : 'M', > + service_id); > if (r < 0) > dvb_perror("asprintf"); > if (parms->p.verbose) > dvb_log("Storing as: '%s'", channel); > } > - for (j = 0; j < parms->n_props; j++) { > - entry->props[j].cmd = parms->dvb_prop[j].cmd; > - entry->props[j].u.data = parms->dvb_prop[j].u.data; > - > - if (!*channel && entry->props[j].cmd == DTV_FREQUENCY) > - freq = parms->dvb_prop[j].u.data; > - } > entry->n_props = parms->n_props; > entry->channel = channel; > > @@ -1225,12 +1228,19 @@ int dvb_store_channel(struct dvb_file **dvb_file, > continue; > > service_id = dvb_scan_handler->program[i].pat_pgm->service_id; > + rc = asprintf(&channel, "#%d", service_id); > + if (rc < 0) { > + dvb_perror("asprintf"); > + return rc; > + } > > rc = get_program_and_store(parms, *dvb_file, dvb_scan_handler, > service_id, channel, NULL, > get_detected, get_nit); > - if (rc < 0) > + if (rc < 0) { > + free(channel); > return rc; > + } > } > > return 0; -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/lib/libdvbv5/dvb-file.c b/lib/libdvbv5/dvb-file.c index 27d9a63..1ea14c4 100644 --- a/lib/libdvbv5/dvb-file.c +++ b/lib/libdvbv5/dvb-file.c @@ -1121,20 +1121,23 @@ static int get_program_and_store(struct dvb_v5_fe_parms_priv *parms, if (rc) dvb_logerr("Couldn't get frontend props"); } + for (j = 0; j < parms->n_props; j++) { + entry->props[j].cmd = parms->dvb_prop[j].cmd; + entry->props[j].u.data = parms->dvb_prop[j].u.data; + + if (!*channel) + freq = entry->props[j].u.data; + } if (!*channel) { - r = asprintf(&channel, "%.2fMHz#%d", freq/1000000., service_id); + free(channel); + r = asprintf(&channel, "%.2f%cHz#%d", freq / 1000000., + dvb_fe_is_satellite(parms->p.current_sys) ? 'G' : 'M', + service_id); if (r < 0) dvb_perror("asprintf"); if (parms->p.verbose) dvb_log("Storing as: '%s'", channel); } - for (j = 0; j < parms->n_props; j++) { - entry->props[j].cmd = parms->dvb_prop[j].cmd; - entry->props[j].u.data = parms->dvb_prop[j].u.data; - - if (!*channel && entry->props[j].cmd == DTV_FREQUENCY) - freq = parms->dvb_prop[j].u.data; - } entry->n_props = parms->n_props; entry->channel = channel; @@ -1225,12 +1228,19 @@ int dvb_store_channel(struct dvb_file **dvb_file, continue; service_id = dvb_scan_handler->program[i].pat_pgm->service_id; + rc = asprintf(&channel, "#%d", service_id); + if (rc < 0) { + dvb_perror("asprintf"); + return rc; + } rc = get_program_and_store(parms, *dvb_file, dvb_scan_handler, service_id, channel, NULL, get_detected, get_nit); - if (rc < 0) + if (rc < 0) { + free(channel); return rc; + } } return 0;
From: Akihiro Tsukada <tskd08@gmail.com> when channel name was not available, it was generated from unset variables, and leaked memory. --- lib/libdvbv5/dvb-file.c | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-)