1.6.2-13: get_fit_statistic was returning NULL for slang fit statistics

Changes.txt

@@ -19,6 +19,7 @@ Changes since 1.6.2 (released Jan 2012)
      uninitialized)
 12.  Fix indexing bug associated with handling ignore/notice in
      change #9 above.
+13.  get_fit_statistic was returning NULL for slang fit statistics
 
 Changes since 1.6.1 (released Jul 2010)
 ---------------------------------------

src/fit-engine.c

@@ -512,6 +512,12 @@ static int sl_report_function (Isis_Fit_Statistic_Type *s, void *pfp, double sta
 
 /*}}}*/
 
+static void sl_deallocate_function (Isis_Fit_Statistic_Type *s)
+{
+   ISIS_FREE (s->symbol);
+   ISIS_FREE (s->option_string);
+}
+
 static Isis_Fit_Statistic_Type *init_sl_statistic (void) /*{{{*/
 {
    SLang_Name_Type *statistic_fun, *report_fun;
@@ -543,6 +549,7 @@ static Isis_Fit_Statistic_Type *init_sl_statistic (void) /*{{{*/
      }
 
    s->compute_statistic = sl_statistic_function;
+   s->deallocate = sl_deallocate_function;
    s->report = sl_report_function;
    s->sl_fun = statistic_fun;
    s->sl_report = report_fun;
@@ -552,10 +559,26 @@ static Isis_Fit_Statistic_Type *init_sl_statistic (void) /*{{{*/
 
 /*}}}*/
 
+static int fixup_sl_statistic_name (char *name)
+{
+   Isis_Fit_Statistic_Type *s;
+
+   if (NULL == (s = find_statistic (name)))
+     return -1;
+
+   if (NULL == (s->option_string = isis_make_string (name)))
+     return -1;
+
+   return 0;
+}
+
 void _add_slang_statistic (char *name) /*{{{*/
 {
-   if (-1 == isis_fit_add_statistic (name, init_sl_statistic))
-     isis_vmesg (FAIL, I_FAILED, __FILE__, __LINE__, "adding fit statistic %s", name);
+   if ((-1 == isis_fit_add_statistic (name, init_sl_statistic))
+       || (-1 == fixup_sl_statistic_name (name)))
+     {
+        isis_vmesg (FAIL, I_FAILED, __FILE__, __LINE__, "adding fit statistic %s", name);
+     }
 }
 
 /*}}}*/

src/isis.h

@@ -36,7 +36,7 @@ extern "C" {
 #include <slang.h>
 
 #define ISIS_VERSION          10602
-#define ISIS_VERSION_STRING  "1.6.2-12"
+#define ISIS_VERSION_STRING  "1.6.2-13"
 #define ISIS_VERSION_PREFIX   1.6.2
 
 #define ISIS_API_VERSION 6

test/fit.sl

@@ -164,6 +164,9 @@ define try_user_statistic () %{{{
      failed ("max_like [chisqr]");
 
    () = evalfile ("max_like.sl");
+   if (NULL == get_fit_statistic ())
+     failed ("max_like [name]");
+
    variable max_info;
    if (-1 == eval_counts(&max_info))
      failed ("max_like [1]");