summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
Diffstat (limited to 'media')
-rw-r--r--media/mp3/mp3_stream_parser.cc2
-rw-r--r--media/mp3/mp3_stream_parser_unittest.cc2
2 files changed, 3 insertions, 1 deletions
diff --git a/media/mp3/mp3_stream_parser.cc b/media/mp3/mp3_stream_parser.cc
index 0688d99..f577708 100644
--- a/media/mp3/mp3_stream_parser.cc
+++ b/media/mp3/mp3_stream_parser.cc
@@ -164,7 +164,7 @@ bool MP3StreamParser::Parse(const uint8* buf, int size) {
int data_size;
queue_.Peek(&data, &data_size);
- if (size < 4)
+ if (data_size < 4)
break;
uint32 start_code = data[0] << 24 | data[1] << 16 | data[2] << 8 | data[3];
diff --git a/media/mp3/mp3_stream_parser_unittest.cc b/media/mp3/mp3_stream_parser_unittest.cc
index 9d30954..2e2b12e 100644
--- a/media/mp3/mp3_stream_parser_unittest.cc
+++ b/media/mp3/mp3_stream_parser_unittest.cc
@@ -165,6 +165,8 @@ TEST_F(MP3StreamParserTest, UnalignedAppend512) {
"NewSegment"
"{ 0K }"
"{ 26K 52K 78K 104K }"
+ "EndOfSegment"
+ "NewSegment"
"{ 130K 156K 182K }"
"{ 208K 235K 261K 287K }"
"{ 313K }"