* Fix a couple of memcpy calls, and remove a bogus one
* Properly use lengths of centre_frequency loop and subcell_info loop
(they count bytes, not entries)
Signed-off-by: Nikolaus Schulz <sch...@macnetix.de>
---
lib/libdvbv5/descriptors/desc_t2_delivery.c | 35 ++++++++++++++-------------
1 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/lib/libdvbv5/descriptors/desc_t2_delivery.c
b/lib/libdvbv5/descriptors/desc_t2_delivery.c
index ab4361d..07a0956 100644
--- a/lib/libdvbv5/descriptors/desc_t2_delivery.c
+++ b/lib/libdvbv5/descriptors/desc_t2_delivery.c
@@ -32,6 +32,7 @@ void dvb_desc_t2_delivery_init(struct dvb_v5_fe_parms *parms,
struct dvb_desc_t2_delivery *d = desc;
unsigned char *p = (unsigned char *) buf;
size_t desc_len = ext->length - 1, len, len2;
+ uint8_t nmemb;
int i;
len = offsetof(struct dvb_desc_t2_delivery, bitfield);
@@ -42,7 +43,7 @@ void dvb_desc_t2_delivery_init(struct dvb_v5_fe_parms *parms,
return;
}
if (desc_len < len2) {
- memcpy(p, buf, len);
+ memcpy(d, p, len);
bswap16(d->system_id);
if (desc_len != len)
@@ -50,44 +51,41 @@ void dvb_desc_t2_delivery_init(struct dvb_v5_fe_parms
*parms,
return;
}
- memcpy(p, buf, len2);
+ memcpy(d, p, len2);
p += len2;
- len = desc_len - (p - buf);
- memcpy(&d->centre_frequency, p, len);
- p += len;
-
if (d->tfs_flag)
- d->frequency_loop_length = 1;
+ d->frequency_loop_length = sizeof(*d->centre_frequency);
else {
d->frequency_loop_length = *p;
p++;
}
+ nmemb = d->frequency_loop_length / sizeof(*d->centre_frequency);
- d->centre_frequency = calloc(d->frequency_loop_length,
- sizeof(*d->centre_frequency));
+ d->centre_frequency = calloc(nmemb, sizeof(*d->centre_frequency));
if (!d->centre_frequency) {
dvb_perror("Out of memory");
return;
}
- memcpy(d->centre_frequency, p, sizeof(*d->centre_frequency) *
d->frequency_loop_length);
- p += sizeof(*d->centre_frequency) * d->frequency_loop_length;
+ memcpy(d->centre_frequency, p, d->frequency_loop_length);
+ p += d->frequency_loop_length;
- for (i = 0; i < d->frequency_loop_length; i++)
+ for (i = 0; i < nmemb; i++)
bswap32(d->centre_frequency[i]);
d->subcel_info_loop_length = *p;
p++;
+ nmemb = d->subcel_info_loop_length / sizeof(*d->subcell);
- d->subcell = calloc(d->subcel_info_loop_length, sizeof(*d->subcell));
+ d->subcell = calloc(nmemb, sizeof(*d->subcell));
if (!d->subcell) {
dvb_perror("Out of memory");
return;
}
- memcpy(d->subcell, p, sizeof(*d->subcell) * d->subcel_info_loop_length);
+ memcpy(d->subcell, p, d->subcel_info_loop_length);
- for (i = 0; i < d->subcel_info_loop_length; i++)
+ for (i = 0; i < nmemb; i++)
bswap16(d->subcell[i].transposer_frequency);
}
@@ -97,6 +95,7 @@ void dvb_desc_t2_delivery_print(struct dvb_v5_fe_parms *parms,
{
const struct dvb_desc_t2_delivery *d = desc;
int i;
+ uint8_t nmemb;
dvb_log("| DVB-T2 delivery");
dvb_log("| plp_id %d", d->plp_id);
@@ -113,10 +112,12 @@ void dvb_desc_t2_delivery_print(struct dvb_v5_fe_parms
*parms,
dvb_log("| bandwidth %d", d->bandwidth);
dvb_log("| SISO MISO %d", d->SISO_MISO);
- for (i = 0; i < d->frequency_loop_length; i++)
+ nmemb = d->frequency_loop_length / sizeof(*d->centre_frequency);
+ for (i = 0; i < nmemb; i++)
dvb_log("| centre frequency[%d] %d", i,
d->centre_frequency[i]);
- for (i = 0; i < d->subcel_info_loop_length; i++) {
+ nmemb = d->subcel_info_loop_length / sizeof(*d->subcell);
+ for (i = 0; i < nmemb; i++) {
dvb_log("| cell_id_extension[%d] %d", i,
d->subcell[i].cell_id_extension);
dvb_log("| transposer frequency %d",
d->subcell[i].transposer_frequency);
}
--
1.7.2.5
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
