Check parameters passed to paircmp()

FreeRADIUS · Apr 19, 2014 · d85f368 · d85f368
1 parent 981bfc1
commit d85f368
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/lib/valuepair.c b/src/lib/valuepair.c
@@ -2576,6 +2576,8 @@ int8_t paircmp_op(VALUE_PAIR const *a, FR_TOKEN op, VALUE_PAIR const *b)
 {
 	int compare;
 
+	if (!a || !b) return -1;
+
 	switch (a->da->type) {
 	case PW_TYPE_IPADDR:
 		switch (b->da->type) {
@@ -2695,8 +2697,10 @@ int8_t paircmp(VALUE_PAIR *a, VALUE_PAIR *b)
 {
 	int compare;
 
+	if (!a) return -1;
+
 	VERIFY_VP(a);
-	VERIFY_VP(b);
+	if (b) VERIFY_VP(b);
 
 	switch (a->op) {
 	case T_OP_CMP_TRUE:
@@ -2726,6 +2730,8 @@ int8_t paircmp(VALUE_PAIR *a, VALUE_PAIR *b)
 				return -1;
 			}
 
+			if (!b) return -1;
+
 			vp_prints_value(buffer, sizeof(buffer), b, 0);
 
 			/*