Skip to content

Reject truncated page headers in ogg_stream_pagein #107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
samuelgirmametaferia wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Reject truncated page headers in ogg_stream_pagein #107

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 43 additions & 12 deletions src/framing.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -773,21 +773,36 @@ int ogg_sync_pageout(ogg_sync_state *oy, ogg_page *og){
into packet segments here as well. */

int ogg_stream_pagein(ogg_stream_state *os, ogg_page *og){
unsigned char *header=og->header;
unsigned char *body=og->body;
long bodysize=og->body_len;
unsigned char *header;
unsigned char *body;
long bodysize;
int segptr=0;

int version=ogg_page_version(og);
int continued=ogg_page_continued(og);
int bos=ogg_page_bos(og);
int eos=ogg_page_eos(og);
ogg_int64_t granulepos=ogg_page_granulepos(og);
int serialno=ogg_page_serialno(og);
long pageno=ogg_page_pageno(og);
int segments=header[26];
int version;
int continued;
int bos;
int eos;
ogg_int64_t granulepos;
int serialno;
long pageno;
int segments;

if(ogg_stream_check(os)) return -1;
if(ogg_stream_check(os) || !og || !og->header || og->header_len<27)
return -1;

header=og->header;
segments=header[26];
if(og->header_len<27+segments) return -1;

body=og->body;
bodysize=og->body_len;
version=ogg_page_version(og);
continued=ogg_page_continued(og);
bos=ogg_page_bos(og);
eos=ogg_page_eos(og);
granulepos=ogg_page_granulepos(og);
serialno=ogg_page_serialno(og);
pageno=ogg_page_pageno(og);

/* clean up 'returned data' */
{
Expand Down Expand Up @@ -1685,6 +1700,22 @@ int main(void){
ogg_stream_init(&os_de,0x04030201);
ogg_sync_init(&oy);

{
ogg_page invalid_page;
unsigned char short_header[1]={0};
unsigned char truncated_lacing[27]={0};

memset(&invalid_page,0,sizeof(invalid_page));
invalid_page.header=short_header;
invalid_page.header_len=1;
if(ogg_stream_pagein(&os_de,&invalid_page)!=-1)error();

truncated_lacing[26]=1;
invalid_page.header=truncated_lacing;
invalid_page.header_len=27;
if(ogg_stream_pagein(&os_de,&invalid_page)!=-1)error();
}

/* Exercise each code path in the framing code. Also verify that
the checksums are working. */

Expand Down