Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
liboggz
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
8
Issues
8
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Xiph.Org
liboggz
Commits
164e35e7
Commit
164e35e7
authored
Sep 10, 2009
by
conrad
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Mozilla #515376: Check index in dirac_parse_info()
parent
876faea2
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
5 deletions
+20
-5
src/liboggz/dirac.c
src/liboggz/dirac.c
+8
-2
src/liboggz/dirac.h
src/liboggz/dirac.h
+5
-1
src/liboggz/oggz_auto.c
src/liboggz/oggz_auto.c
+2
-1
src/tools/oggz_tools.c
src/tools/oggz_tools.c
+5
-1
No files found.
src/liboggz/dirac.c
View file @
164e35e7
...
...
@@ -109,7 +109,7 @@ dirac_bool ( dirac_bs_t *p_bs )
return
dirac_bs_read
(
p_bs
,
1
);
}
void
int
dirac_parse_info
(
dirac_info
*
info
,
unsigned
char
*
data
,
long
len
)
{
dirac_bs_t
bs
;
...
...
@@ -152,6 +152,10 @@ dirac_parse_info (dirac_info *info, unsigned char * data, long len)
info
->
level
=
dirac_uint
(
&
bs
);
/* level */
info
->
video_format
=
video_format
=
dirac_uint
(
&
bs
);
/* index */
if
(
video_format
>=
(
sizeof
(
dirac_fsize_tbl
)
/
sizeof
(
dirac_fsize_tbl
[
0
])))
{
return
-
1
;
}
info
->
width
=
dirac_fsize_tbl
[
video_format
].
width
;
info
->
height
=
dirac_fsize_tbl
[
video_format
].
height
;
if
(
dirac_bool
(
&
bs
))
{
...
...
@@ -187,4 +191,6 @@ dirac_parse_info (dirac_info *info, unsigned char * data, long len)
info
->
fps_denominator
=
dirac_uint
(
&
bs
);
}
}
}
\ No newline at end of file
return
0
;
}
src/liboggz/dirac.h
View file @
164e35e7
...
...
@@ -24,6 +24,10 @@ typedef struct {
ogg_uint32_t
top_field_first
;
}
dirac_info
;
extern
void
dirac_parse_info
(
dirac_info
*
info
,
unsigned
char
*
data
,
long
len
);
/**
* \return -1 Error: parse failure, invalid size index
* \return 0 Success
*/
extern
int
dirac_parse_info
(
dirac_info
*
info
,
unsigned
char
*
data
,
long
len
);
#endif
src/liboggz/oggz_auto.c
View file @
164e35e7
...
...
@@ -371,7 +371,8 @@ auto_dirac (OGGZ * oggz, long serialno, unsigned char * data, long length, void
info
=
oggz_malloc
(
sizeof
(
dirac_info
));
if
(
info
==
NULL
)
return
-
1
;
dirac_parse_info
(
info
,
data
,
length
);
if
(
dirac_parse_info
(
info
,
data
,
length
)
==
-
1
)
return
-
1
;
/* the granulerate is twice the frame rate (in order to handle interlace) */
oggz_set_granulerate
(
oggz
,
serialno
,
...
...
src/tools/oggz_tools.c
View file @
164e35e7
...
...
@@ -289,7 +289,11 @@ ot_dirac_info (unsigned char * data, long len)
buf
=
malloc
(
80
);
info
=
malloc
(
sizeof
(
dirac_info
));
dirac_parse_info
(
info
,
data
,
len
);
if
(
dirac_parse_info
(
info
,
data
,
len
)
==
-
1
)
{
free
(
info
);
free
(
buf
);
return
NULL
;
}
snprintf
(
buf
,
80
,
"
\t
Video-Framerate: %.3f fps
\n
"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment