changeset 3506:65502ec17b75 trunk

Check for NULL
author Matti Hamalainen <ccr@tnsp.org>
date Sun, 09 Sep 2007 03:26:32 +0300
parents 7d865b5f5a04
children 57d2c56f00db
files src/audacious/tuple.c
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/audacious/tuple.c	Sat Sep 08 20:58:26 2007 +0300
+++ b/src/audacious/tuple.c	Sun Sep 09 03:26:32 2007 +0300
@@ -258,7 +258,7 @@
     const gchar *tfield;
 
     g_return_if_fail(tuple != NULL);
-    g_return_if_fail(nfield < FIELD_LAST);
+    g_return_if_fail(nfield < FIELD_LAST && field == NULL);
 
     TUPLE_LOCK_WRITE();
     if (nfield < 0)
@@ -290,7 +290,7 @@
     TupleValueType type = TUPLE_UNKNOWN;
 
     g_return_val_if_fail(tuple != NULL, TUPLE_UNKNOWN);
-    g_return_val_if_fail(nfield < FIELD_LAST, TUPLE_UNKNOWN);
+    g_return_val_if_fail(nfield < FIELD_LAST && field == NULL, TUPLE_UNKNOWN);
 
     TUPLE_LOCK_READ();
     if (nfield < 0) {
@@ -312,7 +312,7 @@
     TupleValue *value;
 
     g_return_val_if_fail(tuple != NULL, NULL);
-    g_return_val_if_fail(nfield < FIELD_LAST, NULL);
+    g_return_val_if_fail(nfield < FIELD_LAST && field == NULL, NULL);
 
     TUPLE_LOCK_READ();
     if (nfield < 0)
@@ -338,7 +338,7 @@
     TupleValue *value;
 
     g_return_val_if_fail(tuple != NULL, 0);
-    g_return_val_if_fail(nfield < FIELD_LAST, 0);
+    g_return_val_if_fail(nfield < FIELD_LAST && field == NULL, 0);
 
     TUPLE_LOCK_READ();
     if (nfield < 0)