Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
daea3209
Commit
daea3209
authored
May 07, 2015
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avcodec/txd: Fix input size checks for dxt1/3 for dimensions % 4 != 0
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
873d7e0e
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
txd.c
libavcodec/txd.c
+2
-2
No files found.
libavcodec/txd.c
View file @
daea3209
...
...
@@ -94,12 +94,12 @@ static int txd_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
if
(
!
(
flags
&
1
))
goto
unsupported
;
case
FF_S3TC_DXT1
:
if
(
bytestream2_get_bytes_left
(
&
gb
)
<
(
w
/
4
)
*
(
h
/
4
)
*
8
)
if
(
bytestream2_get_bytes_left
(
&
gb
)
<
FF_CEIL_RSHIFT
(
w
,
2
)
*
FF_CEIL_RSHIFT
(
h
,
2
)
*
8
)
return
AVERROR_INVALIDDATA
;
ff_decode_dxt1
(
&
gb
,
ptr
,
w
,
h
,
stride
);
break
;
case
FF_S3TC_DXT3
:
if
(
bytestream2_get_bytes_left
(
&
gb
)
<
(
w
/
4
)
*
(
h
/
4
)
*
16
)
if
(
bytestream2_get_bytes_left
(
&
gb
)
<
FF_CEIL_RSHIFT
(
w
,
2
)
*
FF_CEIL_RSHIFT
(
h
,
2
)
*
16
)
return
AVERROR_INVALIDDATA
;
ff_decode_dxt3
(
&
gb
,
ptr
,
w
,
h
,
stride
);
break
;
...
...
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