Merge branch 'feature_stack' into develop

Author: davidfrantz

src/aux-level/param-train-aux.c

@@ -109,7 +109,7 @@ void free_param_train(par_train_t *train){
 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++**/
 int parse_param_train(par_train_t *train){
 FILE *fpar = NULL;
-char  buffer[NPOW_10] = "\0";
+char  buffer[NPOW_16] = "\0";
 int i;
 float sum = 0.0, tol=0.01;
 
@@ -133,7 +133,7 @@ float sum = 0.0, tol=0.01;
 
 
   // process line by line
-  while (fgets(buffer, NPOW_10, fpar) != NULL) parse_parameter(train->params, buffer);
+  while (fgets(buffer, NPOW_16, fpar) != NULL) parse_parameter(train->params, buffer);
   fclose(fpar);
 
 

src/cross-level/param-cl.c

@@ -35,13 +35,13 @@ This file contains functions for parsing parameter files
 +++ Return: number of values
 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++**/
 int length_par(const char *buf){
-char buffer[NPOW_10];
+char buffer[NPOW_16];
 char *ptr = NULL;
 const char *separator = " =";
 int n = -1; // start at -1 to ignore tag
 
 
-  copy_string(buffer, NPOW_10, buf);
+  copy_string(buffer, NPOW_16, buf);
 
   buffer[strcspn(buffer, "\r\n#")] = 0;
 
@@ -52,6 +52,10 @@ int n = -1; // start at -1 to ignore tag
     n++;
   }
 
+  #ifdef FORCE_DEBUG
+  printf("%d elements in parameter vector\n", n);
+  #endif
+
   return n;
 }
 
@@ -778,15 +782,19 @@ void register_charvec_par(params_t *params, const char *name, int char_test, cha
 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++**/
 void parse_parameter(params_t *params, const char *buf){
 int i, n;
-char buffer[NPOW_10];
+char buffer[NPOW_16];
 char *tag = NULL;
 char *ptr = NULL;
 const char *separator = " =";
 
 
-  copy_string(buffer, NPOW_10, buf);
+  copy_string(buffer, NPOW_16, buf);
   buffer[strcspn(buffer, "\r\n#")] = 0;
 
+  #ifdef FORCE_DEBUG
+  printf("%s\n", buffer);
+  #endif
+
   ptr = strtok(buffer, separator);
   tag = ptr;
 
@@ -825,6 +833,10 @@ const char *separator = " =";
             *params->par[i].date_ = parse_date(ptr);
             break;
           case _PAR_CHAR_:
+            if (strlen(ptr) >= NPOW_10){
+              printf("cannot copy parameter, string too long.\n");
+              exit(FAILURE);
+            }
             copy_string(*params->par[i].char_, NPOW_10, ptr);
             break;
           default:
@@ -838,13 +850,12 @@ const char *separator = " =";
         if ((*params->par[i].length = length_par(buf)) < 1) return;
         allocate_par(&params->par[i]);
 
-        copy_string(buffer, NPOW_10, buf);
+        copy_string(buffer, NPOW_16, buf);
         buffer[strcspn(buffer, "\r\n#")] = 0;
 
         ptr = strtok(buffer, separator);
         tag = ptr;
 
-
         n = 0;
 
         while ((ptr = strtok(NULL, separator)) != NULL){
@@ -869,6 +880,10 @@ const char *separator = " =";
               params->par[i].date_vec_[0][n] = parse_date(ptr);
               break;
             case _PAR_CHAR_:
+              if (strlen(ptr) >= NPOW_10){
+                printf("cannot copy parameter, string too long.\n");
+                exit(FAILURE);
+              }
               copy_string(params->par[i].char_vec_[0][n], NPOW_10, ptr);
               break;
             default:

src/higher-level/param-hl.c

@@ -1239,7 +1239,7 @@ void free_param_higher(par_hl_t *phl){
 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++**/
 int parse_param_higher(par_hl_t *phl){
 FILE *fpar;
-char  buffer[NPOW_10] = "\0";
+char  buffer[NPOW_16] = "\0";
 int d, w, m, q, y, tmp;
 double tol = 5e-3;
 
@@ -1371,7 +1371,7 @@ double tol = 5e-3;
 
 
   // process line by line
-  while (fgets(buffer, NPOW_10, fpar) != NULL) parse_parameter(phl->params, buffer);
+  while (fgets(buffer, NPOW_16, fpar) != NULL) parse_parameter(phl->params, buffer);
   fclose(fpar);
 
 

src/lower-level/param-ll.c

@@ -155,7 +155,7 @@ void free_param_lower(par_ll_t *pl2){
 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++**/
 int parse_param_lower(par_ll_t *pl2){
 FILE *fpar = NULL;
-char  buffer[NPOW_10] = "\0";
+char  buffer[NPOW_16] = "\0";
 char  ext[NPOW_10] = "\0";
 char  bname[NPOW_10] = "\0";
 
@@ -200,7 +200,7 @@ char  bname[NPOW_10] = "\0";
   register_lower(pl2->params, pl2);
 
   // parse line by line
-  while (fgets(buffer, NPOW_10, fpar) != NULL) parse_parameter(pl2->params, buffer);
+  while (fgets(buffer, NPOW_16, fpar) != NULL) parse_parameter(pl2->params, buffer);
 
   // close
   fclose(fpar);