[PATCH 5/5] usp10: Use usp10_array_reserve() in GSUB_initialize_language_cache().

[Aric Stewart]

Signed-off-by: Aric Stewart <aric at codeweavers.com>

On 3/18/18 3:39 PM, Henri Verbeet wrote:
> Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
> ---
>   dlls/usp10/opentype.c | 49 +++++++++++++++++++++++++++----------------------
>   1 file changed, 27 insertions(+), 22 deletions(-)
> 
> diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c
> index 616835e8d97..49a88a6991d 100644
> --- a/dlls/usp10/opentype.c
> +++ b/dlls/usp10/opentype.c
> @@ -2690,33 +2690,38 @@ static LoadedLanguage *usp10_script_get_language(LoadedScript *script, OPENTYPE_
>   
>   static void GSUB_initialize_language_cache(LoadedScript *script)
>   {
> -    int i;
> +    const OT_Script *table;
> +    DWORD offset;
> +    SIZE_T i;
>   
> -    if (script->table[USP10_SCRIPT_TABLE_GSUB])
> +    if (!(table = script->table[USP10_SCRIPT_TABLE_GSUB]))
> +        return;
> +
> +    if ((offset = GET_BE_WORD(table->DefaultLangSys)))
>       {
> -        DWORD offset;
> -        const OT_Script *table = script->table[USP10_SCRIPT_TABLE_GSUB];
> -        script->language_count = GET_BE_WORD(table->LangSysCount);
> -        offset = GET_BE_WORD(table->DefaultLangSys);
> -        if (offset)
> -        {
> -            script->default_language.tag = MS_MAKE_TAG('d','f','l','t');
> -            script->default_language.gsub_table = (const BYTE*)table + offset;
> -        }
> +        script->default_language.tag = MS_MAKE_TAG('d','f','l','t');
> +        script->default_language.gsub_table = (const BYTE *)table + offset;
> +    }
>   
> -        if (script->language_count)
> -        {
> -            TRACE("Deflang %p, LangCount %li\n",script->default_language.gsub_table, script->language_count);
> +    if (!(script->language_count = GET_BE_WORD(table->LangSysCount)))
> +        return;
>   
> -            script->languages = heap_alloc_zero(script->language_count * sizeof(*script->languages));
> +    TRACE("Deflang %p, LangCount %lu.\n", script->default_language.gsub_table, script->language_count);
>   
> -            for (i = 0; i < script->language_count; i++)
> -            {
> -                int offset = GET_BE_WORD(table->LangSysRecord[i].LangSys);
> -                script->languages[i].tag = MS_MAKE_TAG(table->LangSysRecord[i].LangSysTag[0], table->LangSysRecord[i].LangSysTag[1], table->LangSysRecord[i].LangSysTag[2], table->LangSysRecord[i].LangSysTag[3]);
> -                script->languages[i].gsub_table = ((const BYTE*)table + offset);
> -            }
> -        }
> +    if (!usp10_array_reserve((void **)&script->languages, &script->languages_size,
> +            script->language_count, sizeof(*script->languages)))
> +    {
> +        ERR("Failed to grow languages array.\n");
> +        return;
> +    }
> +
> +    for (i = 0; i < script->language_count; ++i)
> +    {
> +        script->languages[i].tag = MS_MAKE_TAG(table->LangSysRecord[i].LangSysTag[0],
> +                table->LangSysRecord[i].LangSysTag[1],
> +                table->LangSysRecord[i].LangSysTag[2],
> +                table->LangSysRecord[i].LangSysTag[3]);
> +        script->languages[i].gsub_table = (const BYTE *)table + GET_BE_WORD(table->LangSysRecord[i].LangSys);
>       }
>   }
>   
>