diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-07 08:23:50 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-07 08:23:50 +0100 |
| commit | 51c3a4e7b08aa904ff2af52a9f6f7adc748b361f (patch) | |
| tree | 38fa447dc8970b83becb4d35487d2bb2e565301b /fontconfig/src | |
| parent | d79b6645eb21ca82d506ef038b8ea71a1e431f3f (diff) | |
| parent | 31fd4c5654595a4763e492e4ec26f66ca3a8a405 (diff) | |
| download | vcxsrv-51c3a4e7b08aa904ff2af52a9f6f7adc748b361f.tar.gz vcxsrv-51c3a4e7b08aa904ff2af52a9f6f7adc748b361f.tar.bz2 vcxsrv-51c3a4e7b08aa904ff2af52a9f6f7adc748b361f.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libxtrans fontconfig mesa xserver pixman xkbcomp git update 4 nov 2013
Conflicts:
xorg-server/Xext/shm.c
xorg-server/os/xstrans.c
Diffstat (limited to 'fontconfig/src')
| -rw-r--r-- | fontconfig/src/fcxml.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/fontconfig/src/fcxml.c b/fontconfig/src/fcxml.c index 1a3cef460..da9cb5ddc 100644 --- a/fontconfig/src/fcxml.c +++ b/fontconfig/src/fcxml.c @@ -2567,6 +2567,11 @@ FcParseMatch (FcConfigParse *parse) } FcVStackPopAndDestroy (parse); } + if (!rule) + { + FcConfigMessage (parse, FcSevereWarning, "No <test> nor <edit> elements in <match>"); + return; + } if (!FcConfigAddRule (parse->config, rule, kind)) FcConfigMessage (parse, FcSevereError, "out of memory"); } |