diff options
author | Bryce Harrington <bryce@bryceharrington.org> | 2018-06-12 17:06:13 -0700 |
---|---|---|
committer | Bryce Harrington <bryce@bryceharrington.org> | 2018-06-13 15:21:50 -0700 |
commit | 5a4a86c27f733645a2276d0a3bd2494e73b3dc88 (patch) | |
tree | 29165607d879160f4d189aa450070493b6c1f54e | |
parent | 9b0355a591125a8d7fe20daa82504759e6d472e7 (diff) |
type1-subset: Fix incorrect null ptr check from find_token() (CID #1160662)
subrs was already tested for NULL prior to this, and will never be NULL
at this point. Meanwhile, find_token()'s return is unchecked (it can
return NULL and is checked in all other calls). Quite clearly, this is
a copy-paste error from the prior find_token call, and the intent was to
check array_start not subrs.
Coverity ID: #1160662
Signed-off-by: Bryce Harrington <bryce@bryceharrington.org>
Reviewed-By: Uli Schlachter <psychon@znc.in>
-rw-r--r-- | src/cairo-type1-subset.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cairo-type1-subset.c b/src/cairo-type1-subset.c index 89cb96f2e..5f0745688 100644 --- a/src/cairo-type1-subset.c +++ b/src/cairo-type1-subset.c @@ -1331,7 +1331,7 @@ cairo_type1_font_subset_write_private_dict (cairo_type1_font_subset_t *font, /* look for "dup" which marks the beginning of the first subr */ array_start = find_token (subr_count_end, font->cleartext_end, "dup"); - if (subrs == NULL) + if (array_start == NULL) return CAIRO_INT_STATUS_UNSUPPORTED; /* Read in the subroutines */ |