diff options
| author | Akira TAGOH <akira@tagoh.org> | 2018-07-19 07:55:40 +0000 |
|---|---|---|
| committer | Akira TAGOH <akira@tagoh.org> | 2018-07-19 07:55:40 +0000 |
| commit | efac784b0108d3140d7ec51cf22cb8a4453bd566 (patch) | |
| tree | b6e0bcacc33d8e462455911772d0a9d6b3edce73 | |
| parent | 1ac2218467260cc2f96f202910ba2e1a97291744 (diff) | |
| download | fontconfig-efac784b0108d3140d7ec51cf22cb8a4453bd566.tar.gz | |
Fix dereferencing null pointer
| -rw-r--r-- | src/fccfg.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/fccfg.c b/src/fccfg.c index 3d0356a..d7c48e8 100644 --- a/src/fccfg.c +++ b/src/fccfg.c @@ -2616,12 +2616,13 @@ FcRuleSetAdd (FcRuleSet *rs, switch (r->type) { case FcRuleTest: - if (r->u.test && - r->u.test->kind == FcMatchDefault) - r->u.test->kind = kind; - - if (n < r->u.test->object) - n = r->u.test->object; + if (r->u.test) + { + if (r->u.test->kind == FcMatchDefault) + r->u.test->kind = kind; + if (n < r->u.test->object) + n = r->u.test->object; + } break; case FcRuleEdit: if (n < r->u.edit->object) |