i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more strict check on blocksizes in the header

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@6426 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
shatty
2004-01-30 06:43:47 +00:00
parent a3acf1f210
commit 8db90088c9
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/media/plugins/ogg/OggVorbisStream.cpp
+8 -2
View File
@@ -59,14 +59,20 @@ static int _vorbis_unpack_info(vorbis_info *vi,oggpack_buffer *opb){
vi->bitrate_upper = oggpack_read(opb, 32); vi->bitrate_upper = oggpack_read(opb, 32);
vi->bitrate_nominal = oggpack_read(opb, 32); vi->bitrate_nominal = oggpack_read(opb, 32);
vi->bitrate_lower = oggpack_read(opb, 32); vi->bitrate_lower = oggpack_read(opb, 32);
oggpack_read(opb, 4); // discard blocksizes 0 long blocksizes0 = oggpack_read(opb, 4);
oggpack_read(opb, 4); // discard blocksizes 1 long blocksizes1 = oggpack_read(opb, 4);
if (vi->rate < 1) { if (vi->rate < 1) {
return -1; return -1;
} }
if (vi->channels < 1) { if (vi->channels < 1) {
return -1; return -1;
} }
if (blocksizes0 < 8) {
return -1;
}
if (blocksizes1 < blocksizes0) {
return -1;
}
if (oggpack_read(opb, 1) != 1) { if (oggpack_read(opb, 1) != 1) {
return -1; return -1;
} /* EOP check */ } /* EOP check */