Changeset 40113 for branches/eam_branches/ohana.20170809/src/libfits/header/F_modify.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_modify.c (modified) (5 diffs)

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

@@ -72 +72 @@
     char *ptr = va_arg (argp, char *);
     if (!ptr) goto invalid;
-    strncpy (data, ptr, 68);
+    strncpy (data, ptr, 68); data[68] = 0;
     snprintf (string, 81, "%-8s= '%-8s' / %-s ", field, data, comment);
     goto found_it;
@@ -119 +119 @@
       header[0].datasize += FT_RECORD_SIZE;
       REALLOCATE (header[0].buffer, char, header[0].datasize);
+      /* re-find the "END" marker, in case new memory block is used */
       p = gfits_header_field (header, "END", 1);
       if (p == NULL) return (FALSE); 
@@ -138 +139 @@
   /* write the boolean mode */
   if (!strcmp (mode, "%t")) {
-    if (va_arg (argp, int)) 
-      snprintf (string, 81, "%-8s= %18s T / %-s ", field, " ", comment);
-    else
-      snprintf (string, 81, "%-8s= %18s F / %-s ", field, " ", comment);
+    // fill data will spaces, null terminated, so snprintf can generate a space-filled block
+    memset (data, ' ', FT_LINE_LENGTH); data[FT_LINE_LENGTH] = 0;
+    if (va_arg (argp, int))  {
+      snprintf (string, 81, "%-8s= %18s T / %-s ", field, data, comment);
+    } else {
+      snprintf (string, 81, "%-8s= %18s F / %-s ", field, data, comment);
+    }
   }
 
@@ -148 +152 @@
     char *ptr = va_arg (argp, char *);
     if (!ptr) goto invalid;
-    strncpy (data, ptr, 71);
+    strncpy (data, ptr, 71); data[71] = 0;
     snprintf (string, 81, "%-8s %-71s", field, data);
   }  
@@ -159 +163 @@
     /* keep ' on ends, if there */
     if (qe[0]  == 0x27) qe ++;
-    if (qs[-1] == 0x27) qs --;
+    if (qs >= p + 1) { 
+      if (qs[-1] == 0x27) qs --;
+    }
 
     strncpy (data, qs, MAX (MIN (qe - qs, 71), 0));