X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmath%2Fcoefficient.c;h=1f157433ee21a901eda70718313a2f5edc18c676;hb=a2bd2e76dfd5b22649c624abfe56c1d6cb14c2d9;hp=4f987612ff07d727e60d750b3395d19a3a3e0ac2;hpb=73f67789df91a09ee91976434fb15c2ee1fb5e78;p=pspp-builds.git

diff --git a/src/math/coefficient.c b/src/math/coefficient.c
index 4f987612..1f157433 100644
--- a/src/math/coefficient.c
+++ b/src/math/coefficient.c
@@ -153,20 +153,28 @@ pspp_coeff_get_var (struct pspp_coeff *coef, int i)
   categorical, and has more than one coefficient, use the VAL to find
   its coefficient.
  */
-const struct pspp_coeff *
+struct pspp_coeff *
 pspp_coeff_var_to_coeff (const struct variable *v, struct pspp_coeff **coefs, 
 			 size_t n_coef, const union value *val)
 {
   size_t i = 0;
   size_t j = 0;
   size_t v_idx;
+
   struct pspp_coeff *result = NULL;
 
   if (v != NULL)
     {
       v_idx = var_get_dict_index (v);
-      while (i < n_coef && var_get_dict_index (coefs[i]->v_info->v) != v_idx)
+      while (i < n_coef)
 	{
+	  if (coefs[i]->v_info != NULL)
+	    {
+	      if (var_get_dict_index (coefs[i]->v_info->v) == v_idx)
+		{
+		  break;
+		}
+	    }
 	  i++;
 	}
       result = coefs[i];
@@ -178,8 +186,8 @@ pspp_coeff_var_to_coeff (const struct variable *v, struct pspp_coeff **coefs,
 	  if (val != NULL)
 	    {
 	      j = i;
-	      while (j < n_coef && compare_values (pspp_coeff_get_value (coefs[j], v),
-						   val, var_get_width (v)) != 0)
+	      while (j < n_coef && compare_values_short (pspp_coeff_get_value (coefs[j], v),
+                                                         val, v) != 0)
 		{
 		  j++;
 		}