diff options
| author | marha <marha@users.sourceforge.net> | 2013-09-25 09:37:58 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-09-25 09:37:58 +0200 |
| commit | 1245204b2091d108a8688ff7f749f2c6cc830381 (patch) | |
| tree | c903bf477d9ddf666685494f3b035680d5d41580 /fontconfig/src | |
| parent | b299d73bb416e2a26a642a54d5a15ea9fa30df33 (diff) | |
| parent | 14718f10dcda487178690de9a51cc5acdf21e468 (diff) | |
| download | vcxsrv-1245204b2091d108a8688ff7f749f2c6cc830381.tar.gz vcxsrv-1245204b2091d108a8688ff7f749f2c6cc830381.tar.bz2 vcxsrv-1245204b2091d108a8688ff7f749f2c6cc830381.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa git update 25 Sep 2013
Diffstat (limited to 'fontconfig/src')
| -rw-r--r-- | fontconfig/src/fclist.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fontconfig/src/fclist.c b/fontconfig/src/fclist.c index 0dac6f3ed..e58a62b9f 100644 --- a/fontconfig/src/fclist.c +++ b/fontconfig/src/fclist.c @@ -212,6 +212,8 @@ FcListPatternMatchAny (const FcPattern *p, { int i; + if (!p) + return FcFalse; for (i = 0; i < p->num; i++) { FcPatternElt *pe = &FcPatternElts(p)[i]; |