From 02d0e070638f668bf50a8ce2174c21e5614dd6c4 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Thu, 17 Jan 2008 21:39:31 +0000
Subject: [PATCH] [cairo-font-options] Use cairo_font_options_status() rather
 open-coding.

By switching to cairo_font_options_status() instead of checking against
the _cairo_font_options_nil error object, the API is protected from NULL
dereferences.
---
 src/cairo-font-options.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/cairo-font-options.c b/src/cairo-font-options.c
index 6b2cb08e2..a2cce35e1 100644
--- a/src/cairo-font-options.c
+++ b/src/cairo-font-options.c
@@ -52,7 +52,7 @@ static const cairo_font_options_t _cairo_font_options_nil = {
 void
 _cairo_font_options_init_default (cairo_font_options_t *options)
 {
-    if (options == (cairo_font_options_t *)&_cairo_font_options_nil)
+    if (cairo_font_options_status (options))
 	return;
 
     options->antialias = CAIRO_ANTIALIAS_DEFAULT;
@@ -118,7 +118,7 @@ cairo_font_options_copy (const cairo_font_options_t *original)
 {
     cairo_font_options_t *options;
 
-    if (original == &_cairo_font_options_nil)
+    if (cairo_font_options_status ((cairo_font_options_t *) original))
 	return (cairo_font_options_t *)&_cairo_font_options_nil;
 
     options = malloc (sizeof (cairo_font_options_t));
@@ -142,7 +142,7 @@ cairo_font_options_copy (const cairo_font_options_t *original)
 void
 cairo_font_options_destroy (cairo_font_options_t *options)
 {
-    if (options == (cairo_font_options_t *)&_cairo_font_options_nil)
+    if (cairo_font_options_status (options))
 	return;
 
     free (options);
@@ -184,7 +184,7 @@ void
 cairo_font_options_merge (cairo_font_options_t       *options,
 			  const cairo_font_options_t *other)
 {
-    if (options == (cairo_font_options_t *)&_cairo_font_options_nil)
+    if (cairo_font_options_status (options))
 	return;
 
     if (other->antialias != CAIRO_ANTIALIAS_DEFAULT)
@@ -252,7 +252,7 @@ void
 cairo_font_options_set_antialias (cairo_font_options_t *options,
 				  cairo_antialias_t     antialias)
 {
-    if (options == (cairo_font_options_t *)&_cairo_font_options_nil)
+    if (cairo_font_options_status (options))
 	return;
 
     options->antialias = antialias;
@@ -288,7 +288,7 @@ void
 cairo_font_options_set_subpixel_order (cairo_font_options_t   *options,
 				       cairo_subpixel_order_t  subpixel_order)
 {
-    if (options == (cairo_font_options_t *)&_cairo_font_options_nil)
+    if (cairo_font_options_status (options))
 	return;
 
     options->subpixel_order = subpixel_order;
@@ -324,7 +324,7 @@ void
 cairo_font_options_set_hint_style (cairo_font_options_t *options,
 				   cairo_hint_style_t    hint_style)
 {
-    if (options == (cairo_font_options_t *)&_cairo_font_options_nil)
+    if (cairo_font_options_status (options))
 	return;
 
     options->hint_style = hint_style;
@@ -360,7 +360,7 @@ void
 cairo_font_options_set_hint_metrics (cairo_font_options_t *options,
 				     cairo_hint_metrics_t  hint_metrics)
 {
-    if (options == (cairo_font_options_t *)&_cairo_font_options_nil)
+    if (cairo_font_options_status (options))
 	return;
 
     options->hint_metrics = hint_metrics;