mirror/opustags
1
0
Fork 0
mirror of https://github.com/fmang/opustags.git synced 2025-01-15 20:53:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

raise error on unsynced data

Browse Source
This commit is contained in:
Frédéric Mangano-Tarumi 2018-12-08 12:20:00 -05:00
parent 33ef7ee153
commit b2826bf0cc
5 changed files with 33 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cli.cc
View File

@ -190,6 +190,8 @@ static ot::status process(ot::ogg_reader& reader, ot::ogg_writer* writer, const
ot::status rc = reader.next_page();
if (rc == ot::st::end_of_stream)
break;
else if (rc == ot::st::bad_stream && absolute_page_no == 0)
return {ot::st::bad_stream, "Input is not a valid Ogg file."};
else if (rc != ot::st::ok)
return rc;
auto serialno = ogg_page_serialno(&reader.page);

20
src/ogg.cc
View File

@ -25,19 +25,25 @@ bool ot::is_opus_stream(const ogg_page& identification_header)
ot::status ot::ogg_reader::next_page()
{
while (ogg_sync_pageout(&sync, &page) != 1) {
if (feof(file))
return {st::end_of_stream, "End of stream was reached"};
int rc;
while ((rc = ogg_sync_pageout(&sync, &page)) != 1) {
if (rc == -1)
return {st::bad_stream, "Unsynced data in stream."};
if (ogg_sync_check(&sync) != 0)
return {st::libogg_error, "ogg_sync_check signalled an error."};
if (feof(file)) {
if (sync.fill != sync.returned)
return {st::bad_stream, "Unsynced data at end of stream."};
return {st::end_of_stream, "End of stream was reached."};
}
char* buf = ogg_sync_buffer(&sync, 65536);
if (buf == nullptr)
return {st::libogg_error, "ogg_sync_buffer failed"};
return {st::libogg_error, "ogg_sync_buffer failed."};
size_t len = fread(buf, 1, 65536, file);
if (ferror(file))
return {st::standard_error, "fread error: "s + strerror(errno)};
if (ogg_sync_wrote(&sync, len) != 0)
return {st::libogg_error, "ogg_sync_wrote failed"};
if (ogg_sync_check(&sync) != 0)
return {st::libogg_error, "ogg_sync_check failed"};
return {st::libogg_error, "ogg_sync_wrote failed."};
}
return st::ok;
}

1
src/opustags.h
View File

@ -56,6 +56,7 @@ enum class st {
standard_error, /**< Error raised by the C standard library. */
int_overflow,
/* Ogg */
bad_stream,
end_of_stream,
libogg_error,
/* Opus */

13
t/ogg.cc
View File

@ -116,6 +116,16 @@ static void check_memory_ogg()
}
}
void check_bad_stream()
{
auto err_msg = "did not detect the stream is not an ogg stream";
ot::file input = fmemopen((void*) err_msg, 20, "r");
ot::ogg_reader reader(input.get());
ot::status rc = reader.next_page();
if (rc != ot::st::bad_stream)
throw failure(err_msg);
}
void check_identification()
{
auto good_header = (unsigned char*)
@ -151,9 +161,10 @@ void check_identification()
int main(int argc, char **argv)
{
std::cout << "1..3\n";
std::cout << "1..4\n";
run(check_ref_ogg, "check a reference ogg stream");
run(check_memory_ogg, "build and check a fresh stream");
run(check_bad_stream, "read a non-ogg stream");
run(check_identification, "stream identification");
return 0;
}

6
t/opustags.t
View File

@ -4,7 +4,7 @@ use strict;
use warnings;
use utf8;
use Test::More tests => 27;
use Test::More tests => 28;
use Digest::MD5;
use File::Basename;
@ -73,6 +73,10 @@ is_deeply(opustags('--derp'), ['', <<"EOF", 256], 'unrecognized option shows an
error: Unrecognized option '--derp'.
EOF
is_deeply(opustags('../opustags'), ['', <<"EOF", 256], 'not an Ogg stream');
error: Input is not a valid Ogg file.
EOF
####################################################################################################
# Test the main features of opustags on an Ogg Opus sample file.