[gnome-color-manager] trivial: add some checks to GcmColor functions for NULL dereferences
- From: Richard Hughes <rhughes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-color-manager] trivial: add some checks to GcmColor functions for NULL dereferences
- Date: Tue, 3 Aug 2010 16:07:48 +0000 (UTC)
commit c43fdd3fd207163f584a6df4dcf12f1a905e3e21
Author: Richard Hughes <richard hughsie com>
Date: Tue Aug 3 12:38:21 2010 +0100
trivial: add some checks to GcmColor functions for NULL dereferences
libcolor-glib/gcm-color.c | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
---
diff --git a/libcolor-glib/gcm-color.c b/libcolor-glib/gcm-color.c
index 39abd1e..13f0a3e 100644
--- a/libcolor-glib/gcm-color.c
+++ b/libcolor-glib/gcm-color.c
@@ -43,6 +43,9 @@
void
gcm_color_copy_XYZ (const GcmColorXYZ *src, GcmColorXYZ *dest)
{
+ g_return_if_fail (src != NULL);
+ g_return_if_fail (dest != NULL);
+
dest->X = src->X;
dest->Y = src->Y;
dest->Z = src->Z;
@@ -58,6 +61,9 @@ gcm_color_copy_XYZ (const GcmColorXYZ *src, GcmColorXYZ *dest)
void
gcm_color_copy_RGB (const GcmColorRGB *src, GcmColorRGB *dest)
{
+ g_return_if_fail (src != NULL);
+ g_return_if_fail (dest != NULL);
+
dest->R = src->R;
dest->G = src->G;
dest->B = src->B;
@@ -73,6 +79,9 @@ gcm_color_copy_RGB (const GcmColorRGB *src, GcmColorRGB *dest)
void
gcm_color_convert_RGBint_to_RGB (const GcmColorRGBint *src, GcmColorRGB *dest)
{
+ g_return_if_fail (src != NULL);
+ g_return_if_fail (dest != NULL);
+
dest->R = (gdouble) src->R / 255.0f;
dest->G = (gdouble) src->G / 255.0f;
dest->B = (gdouble) src->B / 255.0f;
@@ -88,6 +97,9 @@ gcm_color_convert_RGBint_to_RGB (const GcmColorRGBint *src, GcmColorRGB *dest)
void
gcm_color_convert_RGB_to_RGBint (const GcmColorRGB *src, GcmColorRGBint *dest)
{
+ g_return_if_fail (src != NULL);
+ g_return_if_fail (dest != NULL);
+
dest->R = (gdouble) src->R * 255.0f;
dest->G = (gdouble) src->G * 255.0f;
dest->B = (gdouble) src->B * 255.0f;
@@ -103,6 +115,9 @@ gcm_color_convert_RGB_to_RGBint (const GcmColorRGB *src, GcmColorRGBint *dest)
void
gcm_color_convert_Yxy_to_XYZ (const GcmColorYxy *src, GcmColorXYZ *dest)
{
+ g_return_if_fail (src != NULL);
+ g_return_if_fail (dest != NULL);
+
g_assert (src->Y >= 0.0f);
g_assert (src->x >= 0.0f);
g_assert (src->y >= 0.0f);
@@ -135,6 +150,9 @@ gcm_color_convert_XYZ_to_Yxy (const GcmColorXYZ *src, GcmColorYxy *dest)
{
gdouble sum;
+ g_return_if_fail (src != NULL);
+ g_return_if_fail (dest != NULL);
+
g_assert (src->X >= 0.0f);
g_assert (src->Y >= 0.0f);
g_assert (src->Z >= 0.0f);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]