Commit 7199e523 authored by Henrik Kurelid's avatar Henrik Kurelid Committed by Stefan Richter

firedtv: use length_field() of PMT as length

Parsed and used the length_field() of the PMT message instead of using
the length field of the message struct, which does not seem to be filled
correctly by e.g. MythTV.
Signed-off-by: default avatarHenrik Kurelid <henrik@kurelid.se>
Signed-off-by: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
parent 096edfbf
...@@ -127,14 +127,20 @@ static int firesat_ca_pmt(struct firesat *firesat, void *arg) ...@@ -127,14 +127,20 @@ static int firesat_ca_pmt(struct firesat *firesat, void *arg)
{ {
struct ca_msg *msg = arg; struct ca_msg *msg = arg;
int data_pos; int data_pos;
int data_length;
int i;
data_pos = 4;
if (msg->msg[3] & 0x80) {
data_length = 0;
for (i = 0; i < (msg->msg[3] & 0x7F); i++)
data_length = (data_length << 8) + msg->msg[data_pos++];
} else {
data_length = msg->msg[3];
}
if (msg->msg[3] & 0x80) return avc_ca_pmt(firesat, &msg->msg[data_pos], data_length) ?
data_pos = (msg->msg[4] && 0x7F) + 4; -EFAULT : 0;
else
data_pos = 4;
return avc_ca_pmt(firesat, &msg->msg[data_pos],
msg->length - data_pos) ? -EFAULT : 0;
} }
static int firesat_ca_send_msg(struct firesat *firesat, void *arg) static int firesat_ca_send_msg(struct firesat *firesat, void *arg)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment