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

identification header check in opus.cc

Browse Source
This commit is contained in:
Frédéric Mangano-Tarumi 2018-11-13 18:45:44 -05:00
parent 9ed2b82b4a
commit 351d6149c9
5 changed files with 39 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/error.cc
View File

@ -8,6 +8,7 @@ static const char* messages[] = {
nullptr, /* standard error: call stderror */
"End of file",
"libogg error",
"Invalid identification header, not an Opus stream",
"Bad magic number",
"Overflowing magic number",
"Overflowing vendor length",

9
src/opus.cc
View File

@ -34,6 +34,15 @@
#define le32toh(x) OSSwapLittleToHostInt32(x)
#endif
ot::status ot::validate_identification_header(const unsigned char* data, size_t size)
{
if (size < 8)
return ot::status::bad_identification_header;
if (memcmp(data, "OpusHead", 8) != 0)
return ot::status::bad_identification_header;
return ot::status::ok;
}
ot::status ot::parse_tags(const char *data, long len, opus_tags *tags)
{
if (len < 0)

7
src/opustags.cc
View File

@ -108,9 +108,10 @@ static int run(ot::options& opt)
// Read all the packets.
while(ogg_stream_packetout(&reader.stream, &reader.packet) == 1){
packet_count++;
if(packet_count == 1){ // Identification header
if(strncmp((char*) reader.packet.packet, "OpusHead", 8) != 0){
error = "opustags: invalid identification header";
if (packet_count == 1) { // Identification header
rc = ot::validate_identification_header(reader.packet.packet, reader.packet.bytes);
if (rc != ot::status::ok) {
error = ot::error_message(rc);
break;
}
}

7
src/opustags.h
View File

@ -34,6 +34,7 @@ enum class status {
standard_error,
end_of_file,
libogg_error,
bad_identification_header,
/* OpusTags parsing errors */
bad_magic_number,
overflowing_magic_number,
@ -197,6 +198,12 @@ struct opus_tags {
std::string extra_data;
};
/**
* Validate the content of the first packet of an Ogg stream to ensure it's a valid OpusHead.
* Returns #ot::status::ok on success, #ot::status::bad_identification_header on error.
*/
status validate_identification_header(const unsigned char* data, size_t size);
status parse_tags(const char *data, long len, opus_tags *tags);
int render_tags(opus_tags *tags, ogg_packet *op);
void delete_tags(opus_tags *tags, const char *field);

19
t/opus.cc
View File

@ -13,6 +13,22 @@
using namespace std::literals::string_literals;
static void check_identification()
{
ot::status rc;
rc = ot::validate_identification_header(reinterpret_cast<const unsigned char*>("OpusHead.."), 10);
if (rc != ot::status::ok)
throw failure("did not accept a good OpusHead");
rc = ot::validate_identification_header(reinterpret_cast<const unsigned char*>("OpusHead"), 7);
if (rc != ot::status::bad_identification_header)
throw failure("accepted an OpusHead that is too short");
rc = ot::validate_identification_header(reinterpret_cast<const unsigned char*>("NotOpusHead"), 11);
if (rc != ot::status::bad_identification_header)
throw failure("did not report the right status for a bad OpusHead");
}
static const char standard_OpusTags[] =
"OpusTags"
"\x14\x00\x00\x00" "opustags test packet"
@ -136,7 +152,8 @@ static void recode_padding()
int main()
{
std::cout << "1..4\n";
std::cout << "1..5\n";
run(check_identification, "check the OpusHead packet");
run(parse_standard, "parse a standard OpusTags packet");
run(parse_corrupted, "correctly reject invalid packets");
run(recode_standard, "recode a standard OpusTags packet");