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

[lang] Fix serializing LangSet from older versions

This commit is contained in:
Behdad Esfahbod 2009-11-16 18:29:26 -05:00
parent 8480c6f863
commit a3b2426819
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/fclang.c
View File

@ -537,9 +537,10 @@ FcChar32
FcLangSetHash (const FcLangSet *ls) FcLangSetHash (const FcLangSet *ls)
{ {
FcChar32 h = 0; FcChar32 h = 0;
int i; int i, count;
for (i = 0; i < ls->map_size; i++) count = FC_MIN (ls->map_size, NUM_LANG_SET_MAP);
for (i = 0; i < count; i++)
h ^= ls->map[i]; h ^= ls->map[i];
if (ls->extra) if (ls->extra)
h ^= ls->extra->num; h ^= ls->extra->num;
@ -777,7 +778,9 @@ FcLangSetSerialize(FcSerialize *serialize, const FcLangSet *l)
if (!l_serialize) if (!l_serialize)
return NULL; return NULL;
*l_serialize = *l; memset (l_serialize->map, '\0', sizeof (l_serialize->map));
memcpy (l_serialize->map, l->map, FC_MIN (sizeof (l_serialize->map), l->map_size * sizeof (l->map[0])));
l_serialize->map_size = NUM_LANG_SET_MAP;
l_serialize->extra = NULL; /* We don't serialize ls->extra */ l_serialize->extra = NULL; /* We don't serialize ls->extra */
return l_serialize; return l_serialize;
} }