Changeset 40113 for branches/eam_branches/ohana.20170809/src/libfits/header/F_print.c

Timestamp:

Aug 9, 2017, 12:47:22 PM (9 years ago)

Author:

eugene

Message:

mostly harmless changes to track down dvopsps segfaults: watch out for Bzero,Bscale in F_set_column.c

File:

• branches/eam_branches/ohana.20170809/src/libfits/header/F_print.c (modified) (5 diffs)

branches/eam_branches/ohana.20170809/src/libfits/header/F_print.c

@@ -7 +7 @@
   /* this function expects one more argument, the value to be written */
 
-  static char blank[] = " ";
-  char string[82], line[80];
+  char string[82], line[82], blank[82];
   char *p;
   va_list argp;  
@@ -41 +40 @@
   memset (p, ' ', FT_LINE_LENGTH);
 
+  memset (blank, ' ', FT_LINE_LENGTH); blank[FT_LINE_LENGTH] = 0;
+
   /* write the new FITS card, setting the comment to be blank */
   /* in these lines, the value field will expand as needed, forcing out the comment
@@ -67 +68 @@
     char *ptr = va_arg (argp, char *);
     if (!ptr) goto invalid;
-    strcpy (line, ptr);
-    line[68] = 0;
+    strncpy (line, ptr, 68); line[68] = 0;
     snprintf (string, 81, "%-8s= '%-8s' / %46s ", field, line, blank);
     goto found_it;
@@ -88 +88 @@
   /* this function expects one more argument, the value to be written */
 
-  static char blank[] = " ";
-  char string[82], line[80];
-  char *p, a;
+  char string[82], line[82], blank[82];
+  char *p;
   va_list argp;  
 
   va_start (argp, N);
+  bzero (line, 82);
+  bzero (string, 82);
+  bzero (blank, 82);
   
   if (mode[0] != '%') {
@@ -122 +124 @@
   memset (p, ' ', FT_LINE_LENGTH);
 
+  memset (blank, ' ', FT_LINE_LENGTH); blank[FT_LINE_LENGTH] = 0;
+
   /* write the boolean mode */
   if (!strcmp (mode, "%t")) {
-    a = va_arg (argp, int);
-    if (a == 1)
+    int a = va_arg (argp, int);
+    if (a == 1) {
       snprintf (string, 81, "%-8s= %18s T / %46s ", field, blank, blank);
-    else
+    } else {
       snprintf (string, 81, "%-8s= %18s F / %46s ", field, blank, blank);
+    }
   }