Address issue #44

[BenSandeen]

This is my first open source PR, so please keep any criticism constructive, thanks!

[est31]

Thanks for the PR!

I'd rather like a solution which uses &codebooks.get() and a if let.

[BenSandeen]

Thanks for the PR!

I'd rather like a solution which uses &codebooks.get() and a if let.

Hopefully this is something like what you have in mind.

[est31]

I had more something like this in mind:

lewton/src/audio.rs

Lines 609 to 613 in 0d13bc4

	let vs = if let Some(vs) = vec_v.get_mut(i..(i + entries.len())) {
	vs
	} else {
	break;
	};

[est31]

@BenSandeen want to change it? Then I can merge the PR :)

[BenSandeen]

Yep, I'll get to work now, sorry for the delay, I've been busy. Hopefully the third time's the charm! :D

[BenSandeen]

And I might as well ask now before pushing another commit: I imagine that, instead of a break like in the else block of that code snippet, you want to return Err(FloorSpecialCase::PacketUndecodable)?
Okay, ignore that while I figure this out, sorry

[est31]

Yes, that's what I originally imagined.

Actually I think an even better way of fixing the bug would be to reject the entire stream already during header decoding.

For this, please edit the read_floor function in header.rs to check any items in floor0_book_list for whether they are above codebook_cnt. It's mentioned in the spec but we didn't implement it :/.

Sorry for the back & forth, but I think that's what's most compliant with the spec.

[est31]

Specifically, there is a similar check with codebook_cnt already below in the function.

[BenSandeen]

K, I'll take a look at that

[BenSandeen]

All right, I undid the previous changes and made the fix in header.rs. If you prefer, I can kill this PR and make a clean PR without the previous changes I've made in the commit history

[est31]

Thanks! I'll merge right away via squashing your commits. In the future you can also check out the command git reset --hard origin/master or git reset --hard upstream/master which will remove any prior commits (needs force push thereafter).