Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Harfbuzz
提交
7ed71eb3
T
Third Party Harfbuzz
项目概览
OpenHarmony
/
Third Party Harfbuzz
1 年多 前同步成功
通知
0
Star
18
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
Third Party Harfbuzz
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
7ed71eb3
编写于
12月 20, 2016
作者:
B
Behdad Esfahbod
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Protect collect_glyphs() and closure() against malicious DDOS fonts
Fixes
https://github.com/behdad/harfbuzz/issues/363
上级
1c98ff87
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
48 addition
and
10 deletion
+48
-10
src/hb-ot-layout-gsub-table.hh
src/hb-ot-layout-gsub-table.hh
+48
-10
未找到文件。
src/hb-ot-layout-gsub-table.hh
浏览文件 @
7ed71eb3
...
...
@@ -41,7 +41,10 @@ struct SingleSubstFormat1
{
TRACE_CLOSURE
(
this
);
Coverage
::
Iter
iter
;
for
(
iter
.
init
(
this
+
coverage
);
iter
.
more
();
iter
.
next
())
{
for
(
iter
.
init
(
this
+
coverage
);
iter
.
more
();
iter
.
next
())
{
/* TODO Switch to range-based API to work around malicious fonts.
* https://github.com/behdad/harfbuzz/issues/363 */
hb_codepoint_t
glyph_id
=
iter
.
get_glyph
();
if
(
c
->
glyphs
->
has
(
glyph_id
))
c
->
glyphs
->
add
((
glyph_id
+
deltaGlyphID
)
&
0xFFFFu
);
...
...
@@ -52,7 +55,10 @@ struct SingleSubstFormat1
{
TRACE_COLLECT_GLYPHS
(
this
);
Coverage
::
Iter
iter
;
for
(
iter
.
init
(
this
+
coverage
);
iter
.
more
();
iter
.
next
())
{
for
(
iter
.
init
(
this
+
coverage
);
iter
.
more
();
iter
.
next
())
{
/* TODO Switch to range-based API to work around malicious fonts.
* https://github.com/behdad/harfbuzz/issues/363 */
hb_codepoint_t
glyph_id
=
iter
.
get_glyph
();
c
->
input
->
add
(
glyph_id
);
c
->
output
->
add
((
glyph_id
+
deltaGlyphID
)
&
0xFFFFu
);
...
...
@@ -120,7 +126,11 @@ struct SingleSubstFormat2
{
TRACE_CLOSURE
(
this
);
Coverage
::
Iter
iter
;
for
(
iter
.
init
(
this
+
coverage
);
iter
.
more
();
iter
.
next
())
{
unsigned
int
count
=
substitute
.
len
;
for
(
iter
.
init
(
this
+
coverage
);
iter
.
more
();
iter
.
next
())
{
if
(
unlikely
(
iter
.
get_coverage
()
>=
count
))
break
;
/* Work around malicious fonts. https://github.com/behdad/harfbuzz/issues/363 */
if
(
c
->
glyphs
->
has
(
iter
.
get_glyph
()))
c
->
glyphs
->
add
(
substitute
[
iter
.
get_coverage
()]);
}
...
...
@@ -130,7 +140,11 @@ struct SingleSubstFormat2
{
TRACE_COLLECT_GLYPHS
(
this
);
Coverage
::
Iter
iter
;
for
(
iter
.
init
(
this
+
coverage
);
iter
.
more
();
iter
.
next
())
{
unsigned
int
count
=
substitute
.
len
;
for
(
iter
.
init
(
this
+
coverage
);
iter
.
more
();
iter
.
next
())
{
if
(
unlikely
(
iter
.
get_coverage
()
>=
count
))
break
;
/* Work around malicious fonts. https://github.com/behdad/harfbuzz/issues/363 */
c
->
input
->
add
(
iter
.
get_glyph
());
c
->
output
->
add
(
substitute
[
iter
.
get_coverage
()]);
}
...
...
@@ -321,7 +335,11 @@ struct MultipleSubstFormat1
{
TRACE_CLOSURE
(
this
);
Coverage
::
Iter
iter
;
for
(
iter
.
init
(
this
+
coverage
);
iter
.
more
();
iter
.
next
())
{
unsigned
int
count
=
sequence
.
len
;
for
(
iter
.
init
(
this
+
coverage
);
iter
.
more
();
iter
.
next
())
{
if
(
unlikely
(
iter
.
get_coverage
()
>=
count
))
break
;
/* Work around malicious fonts. https://github.com/behdad/harfbuzz/issues/363 */
if
(
c
->
glyphs
->
has
(
iter
.
get_glyph
()))
(
this
+
sequence
[
iter
.
get_coverage
()]).
closure
(
c
);
}
...
...
@@ -439,7 +457,11 @@ struct AlternateSubstFormat1
{
TRACE_CLOSURE
(
this
);
Coverage
::
Iter
iter
;
for
(
iter
.
init
(
this
+
coverage
);
iter
.
more
();
iter
.
next
())
{
unsigned
int
count
=
alternateSet
.
len
;
for
(
iter
.
init
(
this
+
coverage
);
iter
.
more
();
iter
.
next
())
{
if
(
unlikely
(
iter
.
get_coverage
()
>=
count
))
break
;
/* Work around malicious fonts. https://github.com/behdad/harfbuzz/issues/363 */
if
(
c
->
glyphs
->
has
(
iter
.
get_glyph
()))
{
const
AlternateSet
&
alt_set
=
this
+
alternateSet
[
iter
.
get_coverage
()];
unsigned
int
count
=
alt_set
.
len
;
...
...
@@ -453,7 +475,11 @@ struct AlternateSubstFormat1
{
TRACE_COLLECT_GLYPHS
(
this
);
Coverage
::
Iter
iter
;
for
(
iter
.
init
(
this
+
coverage
);
iter
.
more
();
iter
.
next
())
{
unsigned
int
count
=
alternateSet
.
len
;
for
(
iter
.
init
(
this
+
coverage
);
iter
.
more
();
iter
.
next
())
{
if
(
unlikely
(
iter
.
get_coverage
()
>=
count
))
break
;
/* Work around malicious fonts. https://github.com/behdad/harfbuzz/issues/363 */
c
->
input
->
add
(
iter
.
get_glyph
());
const
AlternateSet
&
alt_set
=
this
+
alternateSet
[
iter
.
get_coverage
()];
unsigned
int
count
=
alt_set
.
len
;
...
...
@@ -762,7 +788,11 @@ struct LigatureSubstFormat1
{
TRACE_CLOSURE
(
this
);
Coverage
::
Iter
iter
;
for
(
iter
.
init
(
this
+
coverage
);
iter
.
more
();
iter
.
next
())
{
unsigned
int
count
=
ligatureSet
.
len
;
for
(
iter
.
init
(
this
+
coverage
);
iter
.
more
();
iter
.
next
())
{
if
(
unlikely
(
iter
.
get_coverage
()
>=
count
))
break
;
/* Work around malicious fonts. https://github.com/behdad/harfbuzz/issues/363 */
if
(
c
->
glyphs
->
has
(
iter
.
get_glyph
()))
(
this
+
ligatureSet
[
iter
.
get_coverage
()]).
closure
(
c
);
}
...
...
@@ -772,7 +802,11 @@ struct LigatureSubstFormat1
{
TRACE_COLLECT_GLYPHS
(
this
);
Coverage
::
Iter
iter
;
for
(
iter
.
init
(
this
+
coverage
);
iter
.
more
();
iter
.
next
())
{
unsigned
int
count
=
ligatureSet
.
len
;
for
(
iter
.
init
(
this
+
coverage
);
iter
.
more
();
iter
.
next
())
{
if
(
unlikely
(
iter
.
get_coverage
()
>=
count
))
break
;
/* Work around malicious fonts. https://github.com/behdad/harfbuzz/issues/363 */
c
->
input
->
add
(
iter
.
get_glyph
());
(
this
+
ligatureSet
[
iter
.
get_coverage
()]).
collect_glyphs
(
c
);
}
...
...
@@ -923,7 +957,11 @@ struct ReverseChainSingleSubstFormat1
const
ArrayOf
<
GlyphID
>
&
substitute
=
StructAfter
<
ArrayOf
<
GlyphID
>
>
(
lookahead
);
Coverage
::
Iter
iter
;
for
(
iter
.
init
(
this
+
coverage
);
iter
.
more
();
iter
.
next
())
{
count
=
substitute
.
len
;
for
(
iter
.
init
(
this
+
coverage
);
iter
.
more
();
iter
.
next
())
{
if
(
unlikely
(
iter
.
get_coverage
()
>=
count
))
break
;
/* Work around malicious fonts. https://github.com/behdad/harfbuzz/issues/363 */
if
(
c
->
glyphs
->
has
(
iter
.
get_glyph
()))
c
->
glyphs
->
add
(
substitute
[
iter
.
get_coverage
()]);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录