diff options
| author | Youngbok Shin <youngb.shin@samsung.com> | 2017-10-13 04:52:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal> | 2017-10-13 04:52:13 +0000 |
| commit | b7c08abb3bbd4cabedd229b6c485dbeeab34a81d (patch) | |
| tree | 54b025488b9d6f0cc73fa4cabe276ab59788df3e | |
| parent | 006be106191ef78bf5ffc5e59ec34a061d3ed372 (diff) | |
| parent | a220154b010cc943de53bf7c9fdd86324f4119fe (diff) | |
| download | fontconfig-tizen_3.0_tv.tar.gz fontconfig-tizen_3.0_tv.tar.bz2 fontconfig-tizen_3.0_tv.zip | |
Merge "Add a condition to FcCacheOffsetsValid() for detecting empty data of cache" into tizen_3.0_tvtizen_3.0_tv
| -rw-r--r-- | src/fccache.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/fccache.c b/src/fccache.c index 6f3c68a2..f9e66e83 100644 --- a/src/fccache.c +++ b/src/fccache.c @@ -642,12 +642,22 @@ FcCacheOffsetsValid (FcCache *cache) FcValueListPtr l; char *last_offset; + /* TIZEN_ONLY(20171013): Add a condition to FcCacheOffsetsValid() for detecting empty data of cache if ((char *) font < base || (char *) font > end - sizeof (FcFontSet) || font->elts_offset < 0 || font->elts_offset > end - (char *) font || font->num > (end - (char *) font - font->elts_offset) / sizeof (FcPatternElt)) return FcFalse; + */ + if ((char *) font < base || + (char *) font > end - sizeof (FcFontSet) || + font->elts_offset < 0 || + font->elts_offset > end - (char *) font || + font->num > (end - (char *) font - font->elts_offset) / sizeof (FcPatternElt) || + !FcRefIsConst (&font->ref)) + return FcFalse; + /* END */ e = FcPatternElts(font); |