summaryrefslogtreecommitdiff
path: root/pango
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2021-05-09 04:54:51 +0000
committerMatthias Clasen <mclasen@redhat.com>2021-05-09 04:54:51 +0000
commit4e2bc456d20e331cb45cdef41f67d8fd734874e1 (patch)
treec786eb1a15801017726eb20900f1571056f519c5 /pango
parent8b1e9f9e6438ba5e018c8117e427e2c6ae30413e (diff)
parent7b3182a3b5427137557d257f7024a5078a096fc3 (diff)
downloadpango-4e2bc456d20e331cb45cdef41f67d8fd734874e1.tar.gz
Merge branch 'add-null-checkds' into 'master'
Add some NULL checks Closes #268 See merge request GNOME/pango!328
Diffstat (limited to 'pango')
-rw-r--r--pango/pangocoretext-fontmap.c3
-rw-r--r--pango/pangofc-fontmap.c3
-rw-r--r--pango/pangowin32-fontmap.c3
3 files changed, 6 insertions, 3 deletions
diff --git a/pango/pangocoretext-fontmap.c b/pango/pangocoretext-fontmap.c
index 09437b4a..81bf7bf7 100644
--- a/pango/pangocoretext-fontmap.c
+++ b/pango/pangocoretext-fontmap.c
@@ -529,7 +529,8 @@ pango_core_text_face_list_sizes (PangoFontFace *face,
int *n_sizes)
{
*n_sizes = 0;
- *sizes = NULL;
+ if (sizes)
+ *sizes = NULL;
}
G_DEFINE_TYPE (PangoCoreTextFace, pango_core_text_face, PANGO_TYPE_FONT_FACE);
diff --git a/pango/pangofc-fontmap.c b/pango/pangofc-fontmap.c
index 7966a8cd..f74b2c15 100644
--- a/pango/pangofc-fontmap.c
+++ b/pango/pangofc-fontmap.c
@@ -2904,7 +2904,8 @@ pango_fc_face_list_sizes (PangoFontFace *face,
FcObjectSet *objectset;
FcFontSet *fonts;
- *sizes = NULL;
+ if (sizes)
+ *sizes = NULL;
*n_sizes = 0;
if (G_UNLIKELY (!fcface->family || !fcface->family->fontmap))
return;
diff --git a/pango/pangowin32-fontmap.c b/pango/pangowin32-fontmap.c
index e5e81bba..18d4544e 100644
--- a/pango/pangowin32-fontmap.c
+++ b/pango/pangowin32-fontmap.c
@@ -1794,7 +1794,8 @@ pango_win32_face_list_sizes (PangoFontFace *face,
* for scalable fonts it's simple, and currently we only have such
* see : pango_win32_enum_proc(), TRUETYPE_FONTTYPE
*/
- *sizes = NULL;
+ if (sizes)
+ *sizes = NULL;
*n_sizes = 0;
}