fixed some seg faults with strings

Author: claude

ChangeLog

@@ -1,3 +1,7 @@
+2007-11-13  Claude Lepage <[email protected]>
+	* fixed some string manipulations that were causing 
+          segmentation faults
+
 2005-04-07  Andrew Janke  <[email protected]>
 
 	* removed multiple #def MALLOC's replaced with GI_MALLOC

Makefile.am

@@ -13,9 +13,18 @@ noinst_HEADERS = glim.h \
 
 EXTRA_DIST = $(m4_files)
 
-m4_files = m4/mni_REQUIRE_LIB.m4 \
-	m4/mni_REQUIRE_MNILIBS.m4 \
-	m4/smr_WITH_BUILD_PATH.m4
-
-
+m4_files = m4/acx_pthread.m4 \
+           m4/ax_check_gl.m4 \
+           m4/ax_check_glu.m4 \
+           m4/ax_check_glut.m4 \
+           m4/ax_lang_compiler_ms.m4 \
+           m4/lf_link_headers.m4 \
+           m4/mni_REQUIRE_LIB.m4 \
+           m4/mni_REQUIRE_MNILIBS.m4 \
+           m4/mni_REQUIRE_OPENINVENTOR.m4 \
+           m4/mni_cxx_have_koenig_lookup.m4 \
+           m4/smr_CGAL_MAKEFILE.m4 \
+           m4/smr_OPTIONAL_LIB.m4 \
+           m4/smr_REQUIRED_LIB.m4 \
+           m4/smr_WITH_BUILD_PATH.m4
 

NEWS

@@ -1,4 +1,4 @@
-Version 1.1.2
+Version 1.2
 
 * fixed some string manipulations that were causing
   segmentation faults

glim.c

@@ -403,6 +403,8 @@ int get_contrast_from_column(char *contrast_column, int num_columns,
 
    if(column > num_columns) {
       fprintf(stderr,"\nError in get_contrast_from_column: column number too large.\n");
+
+printf( "column = %d  num_columns = %d\n", column, num_columns );
       return FALSE;
    }
 

glim_image.c

@@ -2300,7 +2300,7 @@ int get_avg_raw(char *dst, char *key, int argc, char **argv)
 ---------------------------------------------------------------------------- */
 void create_stat_variable(Program_Data *program_data, char **input_files)
 {
-   char *outfile;
+   char *outfile = NULL;
    int mincid, varid;
    int ifile, itest;
    int icont;
@@ -2329,16 +2329,16 @@ void create_stat_variable(Program_Data *program_data, char **input_files)
    char *link_str = "link-function";
    char *variance_fun_str = "variance-function";
    char *family_str = "exponential-family";
-   char *param_str, *contr_str;
+   char *param_str = NULL, *contr_str = NULL;
    char *int_lambda_str = "integrated-det-lambda";
    char *search_vol_str = "search-volume";
    char *search_file_str = "search-region-file";
    char *pooled_fwhm_str = "pooled-FWHM-estimate";
    char *int_fwhm_str = "integrated-FWHM-estimate";
    char *fwhm_file_str = "local-FWHM-file";
    char *fwhm_matrix_str = "pooled-lambda-matrix";
-   char *fwhm_matrix_gaussian_str;
-   char *fwhm_matrix_avg_str;
+   char *fwhm_matrix_gaussian_str = NULL;
+   char *fwhm_matrix_avg_str = NULL;
    char *num_fwhm_str = "num-voxel-pool-FWHM";
    glm_obj = program_data->glm_obj;
    lambda_buffer = program_data->lambda_buffer;
@@ -3101,7 +3101,7 @@ void create_glim_parameters(Glm_Object *glm_obj, char **input_files,
                                     + 15*glm_obj->design_matrix->num_columns +
                                     300));
       sprintf(tmpstring,"Using file: %s. Regressors: ", input_files[i]);
-      strcat(tmpstring2[i], tmpstring);
+      strcpy(tmpstring2[i], tmpstring);
       for(j=0; j<glm_obj->design_matrix->num_columns; j++) {
          sprintf(tmpstring, "%5.2e  ",glm_obj->design_matrix->values[i][j]);
          strcat(tmpstring2[i], tmpstring);