Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Harfbuzz
提交
38b8b405
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看板
体验新版 GitCode,发现更多精彩内容 >>
提交
38b8b405
编写于
8月 27, 2013
作者:
B
Behdad Esfahbod
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix possible snprintf OOM
https://bugzilla.redhat.com/show_bug.cgi?id=1001645
上级
d22548c0
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
12 addition
and
11 deletion
+12
-11
src/hb-buffer-serialize.cc
src/hb-buffer-serialize.cc
+7
-7
src/hb-font-private.hh
src/hb-font-private.hh
+2
-1
src/hb-shape.cc
src/hb-shape.cc
+3
-3
未找到文件。
src/hb-buffer-serialize.cc
浏览文件 @
38b8b405
...
...
@@ -100,10 +100,10 @@ _hb_buffer_serialize_glyphs_json (hb_buffer_t *buffer,
*
p
++
=
'"'
;
}
else
p
+=
snprintf
(
p
,
ARRAY_LENGTH
(
b
)
-
(
p
-
b
),
"%u"
,
info
[
i
].
codepoint
);
p
+=
MAX
(
0
,
snprintf
(
p
,
ARRAY_LENGTH
(
b
)
-
(
p
-
b
),
"%u"
,
info
[
i
].
codepoint
)
);
if
(
!
(
flags
&
HB_BUFFER_SERIALIZE_FLAG_NO_CLUSTERS
))
{
p
+=
snprintf
(
p
,
ARRAY_LENGTH
(
b
)
-
(
p
-
b
),
",
\"
cl
\"
:%u"
,
info
[
i
].
cluster
);
p
+=
MAX
(
0
,
snprintf
(
p
,
ARRAY_LENGTH
(
b
)
-
(
p
-
b
),
",
\"
cl
\"
:%u"
,
info
[
i
].
cluster
)
);
}
if
(
!
(
flags
&
HB_BUFFER_SERIALIZE_FLAG_NO_POSITIONS
))
...
...
@@ -161,21 +161,21 @@ _hb_buffer_serialize_glyphs_text (hb_buffer_t *buffer,
p
+=
strlen
(
p
);
}
else
p
+=
snprintf
(
p
,
ARRAY_LENGTH
(
b
)
-
(
p
-
b
),
"%u"
,
info
[
i
].
codepoint
);
p
+=
MAX
(
0
,
snprintf
(
p
,
ARRAY_LENGTH
(
b
)
-
(
p
-
b
),
"%u"
,
info
[
i
].
codepoint
)
);
if
(
!
(
flags
&
HB_BUFFER_SERIALIZE_FLAG_NO_CLUSTERS
))
{
p
+=
snprintf
(
p
,
ARRAY_LENGTH
(
b
)
-
(
p
-
b
),
"=%u"
,
info
[
i
].
cluster
);
p
+=
MAX
(
0
,
snprintf
(
p
,
ARRAY_LENGTH
(
b
)
-
(
p
-
b
),
"=%u"
,
info
[
i
].
cluster
)
);
}
if
(
!
(
flags
&
HB_BUFFER_SERIALIZE_FLAG_NO_POSITIONS
))
{
if
(
pos
[
i
].
x_offset
||
pos
[
i
].
y_offset
)
p
+=
snprintf
(
p
,
ARRAY_LENGTH
(
b
)
-
(
p
-
b
),
"@%d,%d"
,
pos
[
i
].
x_offset
,
pos
[
i
].
y_offset
);
p
+=
MAX
(
0
,
snprintf
(
p
,
ARRAY_LENGTH
(
b
)
-
(
p
-
b
),
"@%d,%d"
,
pos
[
i
].
x_offset
,
pos
[
i
].
y_offset
)
);
*
p
++
=
'+'
;
p
+=
snprintf
(
p
,
ARRAY_LENGTH
(
b
)
-
(
p
-
b
),
"%d"
,
pos
[
i
].
x_advance
);
p
+=
MAX
(
0
,
snprintf
(
p
,
ARRAY_LENGTH
(
b
)
-
(
p
-
b
),
"%d"
,
pos
[
i
].
x_advance
)
);
if
(
pos
->
y_advance
)
p
+=
snprintf
(
p
,
ARRAY_LENGTH
(
b
)
-
(
p
-
b
),
",%d"
,
pos
[
i
].
y_advance
);
p
+=
MAX
(
0
,
snprintf
(
p
,
ARRAY_LENGTH
(
b
)
-
(
p
-
b
),
",%d"
,
pos
[
i
].
y_advance
)
);
}
if
(
buf_size
>
(
p
-
b
))
...
...
src/hb-font-private.hh
浏览文件 @
38b8b405
...
...
@@ -426,7 +426,8 @@ struct hb_font_t {
{
if
(
get_glyph_name
(
glyph
,
s
,
size
))
return
;
snprintf
(
s
,
size
,
"gid%u"
,
glyph
);
if
(
size
&&
snprintf
(
s
,
size
,
"gid%u"
,
glyph
)
<
0
)
*
s
=
'\0'
;
}
/* Parses gidDDD and uniUUUU strings automatically. */
...
...
src/hb-shape.cc
浏览文件 @
38b8b405
...
...
@@ -181,18 +181,18 @@ hb_feature_to_string (hb_feature_t *feature,
{
s
[
len
++
]
=
'['
;
if
(
feature
->
start
)
len
+=
snprintf
(
s
+
len
,
ARRAY_LENGTH
(
s
)
-
len
,
"%d"
,
feature
->
start
);
len
+=
MAX
(
0
,
snprintf
(
s
+
len
,
ARRAY_LENGTH
(
s
)
-
len
,
"%d"
,
feature
->
start
)
);
if
(
feature
->
end
!=
feature
->
start
+
1
)
{
s
[
len
++
]
=
':'
;
if
(
feature
->
end
!=
(
unsigned
int
)
-
1
)
len
+=
snprintf
(
s
+
len
,
ARRAY_LENGTH
(
s
)
-
len
,
"%d"
,
feature
->
end
);
len
+=
MAX
(
0
,
snprintf
(
s
+
len
,
ARRAY_LENGTH
(
s
)
-
len
,
"%d"
,
feature
->
end
)
);
}
s
[
len
++
]
=
']'
;
}
if
(
feature
->
value
>
1
)
{
s
[
len
++
]
=
'='
;
len
+=
snprintf
(
s
+
len
,
ARRAY_LENGTH
(
s
)
-
len
,
"%d"
,
feature
->
value
);
len
+=
MAX
(
0
,
snprintf
(
s
+
len
,
ARRAY_LENGTH
(
s
)
-
len
,
"%d"
,
feature
->
value
)
);
}
assert
(
len
<
ARRAY_LENGTH
(
s
));
len
=
MIN
(
len
,
size
-
1
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录