Because we've changed FcPatternAddString to use FcStrStaticName and not
FcValueSave, explicitly handle the case of a null string.
This commit is contained in:
parent
982b598278
commit
204da5a8b8
|
@ -1,3 +1,9 @@
|
||||||
|
2005-12-07 Patrick Lam <plam@mit.edu>
|
||||||
|
* src/fcpat.c (FcPatternAddString):
|
||||||
|
|
||||||
|
Because we've changed FcPatternAddString to use FcStrStaticName
|
||||||
|
and not FcValueSave, explicitly handle the case of a null string.
|
||||||
|
|
||||||
2005-12-06 Patrick Lam <plam@mit.edu>
|
2005-12-06 Patrick Lam <plam@mit.edu>
|
||||||
* fc-cat/fc-cat.c (FcCachePrintSet, FcCacheGlobalFileReadAndPrint):
|
* fc-cat/fc-cat.c (FcCachePrintSet, FcCacheGlobalFileReadAndPrint):
|
||||||
|
|
||||||
|
|
|
@ -1029,6 +1029,13 @@ FcPatternAddString (FcPattern *p, const char *object, const FcChar8 *s)
|
||||||
{
|
{
|
||||||
FcValue v;
|
FcValue v;
|
||||||
|
|
||||||
|
if (!s)
|
||||||
|
{
|
||||||
|
v.type = FcTypeVoid;
|
||||||
|
v.u.s = 0;
|
||||||
|
return FcPatternAdd (p, object, v, FcTrue);
|
||||||
|
}
|
||||||
|
|
||||||
v.type = FcTypeString;
|
v.type = FcTypeString;
|
||||||
v.u.s = FcStrStaticName(s);
|
v.u.s = FcStrStaticName(s);
|
||||||
return FcPatternAdd (p, object, v, FcTrue);
|
return FcPatternAdd (p, object, v, FcTrue);
|
||||||
|
|
Loading…
Reference in New Issue