Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
godot
Project
Overview
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
community
godot
Commits
8c67b43b
Commit
8c67b43b
authored
Jan 23, 2019
by
Rémi Verschelde
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
theora: Add upstream patch to fix UB warning
Patch from
https://git.xiph.org/?p=theora.git;a=commit;h=0ae66d565e6bead8604d312bc1a4e9dccf245c88
Fixes #25221.
parent
f4b747d3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
45 additions
and
4 deletions
+45
-4
README.md
thirdparty/README.md
+3
-0
decode.c
thirdparty/libtheora/decode.c
+4
-4
theora.git-0ae66d565e6bead8604d312bc1a4e9dccf245c88.patch
...theora.git-0ae66d565e6bead8604d312bc1a4e9dccf245c88.patch
+38
-0
No files found.
thirdparty/README.md
View file @
8c67b43b
...
...
@@ -202,6 +202,9 @@ Files extracted from upstream source:
-
all .h files in include/theora/ as theora/
-
COPYING and LICENSE
Upstream patches included in the
`patches`
directory have been applied
on top of the 1.1.1 source (not included in any stable release yet).
## libvorbis
...
...
thirdparty/libtheora/decode.c
View file @
8c67b43b
...
...
@@ -397,10 +397,10 @@ static int oc_dec_init(oc_dec_ctx *_dec,const th_info *_info,
int
qsum
;
qsum
=
0
;
for
(
qti
=
0
;
qti
<
2
;
qti
++
)
for
(
pli
=
0
;
pli
<
3
;
pli
++
){
qsum
+=
_dec
->
state
.
dequant_tables
[
q
ti
][
pli
][
q
i
][
12
]
+
_dec
->
state
.
dequant_tables
[
q
ti
][
pli
][
q
i
][
17
]
+
_dec
->
state
.
dequant_tables
[
q
ti
][
pli
][
q
i
][
18
]
+
_dec
->
state
.
dequant_tables
[
q
ti
][
pli
][
q
i
][
24
]
<<
(
pli
==
0
);
qsum
+=
_dec
->
state
.
dequant_tables
[
q
i
][
pli
][
qt
i
][
12
]
+
_dec
->
state
.
dequant_tables
[
q
i
][
pli
][
qt
i
][
17
]
+
_dec
->
state
.
dequant_tables
[
q
i
][
pli
][
qt
i
][
18
]
+
_dec
->
state
.
dequant_tables
[
q
i
][
pli
][
qt
i
][
24
]
<<
(
pli
==
0
);
}
_dec
->
pp_sharp_mod
[
qi
]
=-
(
qsum
>>
11
);
}
...
...
thirdparty/libtheora/patches/theora.git-0ae66d565e6bead8604d312bc1a4e9dccf245c88.patch
0 → 100644
View file @
8c67b43b
From 0ae66d565e6bead8604d312bc1a4e9dccf245c88 Mon Sep 17 00:00:00 2001
From: Tim Terriberry <tterribe@xiph.org>
Date: Tue, 8 May 2012 02:51:57 +0000
Subject: [PATCH] Fix pp_sharp_mod calculation.
This was broken when the dequant_tables indexing changed in commit
r16102, but it only affected post-processing quality, so we never
noticed.
With gcc 4.8.0, this can now trigger a segfault during decoder
initialization.
svn path=/trunk/theora/; revision=18268
---
decode.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/decode.c b/decode.c
index b803505..9f2516a 100644
--- a/decode.c
+++ b/decode.c
@@ -400,10 +400,10 @@ static int oc_dec_init(oc_dec_ctx *_dec,const th_info *_info,
int qsum;
qsum=0;
for(qti=0;qti<2;qti++)for(pli=0;pli<3;pli++){
- qsum+=_dec->state.dequant_tables[qti][pli][qi][12]+
- _dec->state.dequant_tables[qti][pli][qi][17]+
- _dec->state.dequant_tables[qti][pli][qi][18]+
- _dec->state.dequant_tables[qti][pli][qi][24]<<(pli==0);
+ qsum+=_dec->state.dequant_tables[qi][pli][qti][12]+
+ _dec->state.dequant_tables[qi][pli][qti][17]+
+ _dec->state.dequant_tables[qi][pli][qti][18]+
+ _dec->state.dequant_tables[qi][pli][qti][24]<<(pli==0);
}
_dec->pp_sharp_mod[qi]=-(qsum>>11);
}
--
2.11.0
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