bluetooth: don't access outside array range

This commit is contained in:
Marc-André Lureau 2009-03-26 21:31:12 +02:00
parent 61cd6d4c19
commit 9e8c2d393a

View file

@ -448,8 +448,8 @@ static int setup_a2dp(struct userdata *u) {
break; break;
} }
if ((unsigned) i >= PA_ELEMENTSOF(freq_table)) { if ((unsigned) i == PA_ELEMENTSOF(freq_table)) {
for (; i >= 0; i--) { for (--i; i >= 0; i--) {
if (cap->frequency & freq_table[i].cap) { if (cap->frequency & freq_table[i].cap) {
u->sample_spec.rate = freq_table[i].rate; u->sample_spec.rate = freq_table[i].rate;
cap->frequency = freq_table[i].cap; cap->frequency = freq_table[i].cap;
@ -463,6 +463,8 @@ static int setup_a2dp(struct userdata *u) {
} }
} }
pa_assert(i < PA_ELEMENTSOF(freq_table));
if (cap->capability.configured) if (cap->capability.configured)
return 0; return 0;