walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Set *coord to nullptr

This commit is contained in:
Koji Ishii 2020-08-31 17:21:21 +09:00 committed by Behdad Esfahbod
parent 4e0bddb7fe
commit 7e6070a47f
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/hb-ot-layout-base-table.hh
View File

@ -379,12 +379,20 @@ struct Axis
const BaseCoord **coord) const const BaseCoord **coord) const
{ {
const BaseScript &base_script = (this+baseScriptList).get_base_script (script_tag); const BaseScript &base_script = (this+baseScriptList).get_base_script (script_tag);
if (!base_script.has_data ()) return false; if (!base_script.has_data ())
{
*coord = nullptr;
return false;
}
if (likely (coord)) if (likely (coord))
{ {
unsigned int tag_index = 0; unsigned int tag_index = 0;
if (!(this+baseTagList).bfind (baseline_tag, &tag_index)) return false; if (!(this+baseTagList).bfind (baseline_tag, &tag_index))
{
*coord = nullptr;
return false;
}
*coord = &base_script.get_base_coord (tag_index); *coord = &base_script.get_base_coord (tag_index);
} }
@ -398,7 +406,11 @@ struct Axis
const BaseCoord **max_coord) const const BaseCoord **max_coord) const
{ {
const BaseScript &base_script = (this+baseScriptList).get_base_script (script_tag); const BaseScript &base_script = (this+baseScriptList).get_base_script (script_tag);
if (!base_script.has_data ()) return false; if (!base_script.has_data ())
{
*min_coord = *max_coord = nullptr;
return false;
}
base_script.get_min_max (language_tag).get_min_max (feature_tag, min_coord, max_coord); base_script.get_min_max (language_tag).get_min_max (feature_tag, min_coord, max_coord);