diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-04 12:08:23 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-04 12:08:23 +0100 |
| commit | 31fd4c5654595a4763e492e4ec26f66ca3a8a405 (patch) | |
| tree | 8d6b249c93725e838676e26af171a167f6f20903 /fontconfig | |
| parent | e4ef724e06621be9325fc41ed886fd404467fdc0 (diff) | |
| download | vcxsrv-31fd4c5654595a4763e492e4ec26f66ca3a8a405.tar.gz vcxsrv-31fd4c5654595a4763e492e4ec26f66ca3a8a405.tar.bz2 vcxsrv-31fd4c5654595a4763e492e4ec26f66ca3a8a405.zip | |
libxtrans fontconfig mesa xserver pixman xkbcomp git update 4 nov 2013
xserver commit 33c85beed521c9db140cadd8c5aa9992398ee1fe
xkbcomp commit e3e6e938535532bfad175c1635256ab7fb3ac943
pixman commit 8cbc7da4e525c96a8e089e4c1baee75dc8315218
libxtrans commit 1fb0fd555a16dd8fce4abc6d3fd22b315f46762a
fontconfig commit 767108aa1327cf0156dfc6f024dbc8fb783ae067
mesa commit 2f896627175384fd5943f21804700a155ba4e8a0
Diffstat (limited to 'fontconfig')
| -rw-r--r-- | fontconfig/fonts.dtd | 2 | ||||
| -rw-r--r-- | fontconfig/src/fcxml.c | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/fontconfig/fonts.dtd b/fontconfig/fonts.dtd index 4c38e77f0..479f2c0fb 100644 --- a/fontconfig/fonts.dtd +++ b/fontconfig/fonts.dtd @@ -140,7 +140,7 @@ if 'target' is 'font', execute the match on the result of a font selection. --> -<!ELEMENT match (test*, edit*)+> +<!ELEMENT match (test|edit)+> <!ATTLIST match target (pattern|font|scan) "pattern"> diff --git a/fontconfig/src/fcxml.c b/fontconfig/src/fcxml.c index 8ff10b6e6..bd95580aa 100644 --- a/fontconfig/src/fcxml.c +++ b/fontconfig/src/fcxml.c @@ -2566,6 +2566,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"); } |