Changeset 33128 for branches/eam_branches/ipp-20111122/Ohana/src/libfits/header/F_modify.c

Timestamp:

Jan 22, 2012, 6:26:57 AM (14 years ago)

Author:

eugene

Message:

add function gfits_set_bintable_column_reformat (sets column type to match output table description); give normal TZERO and TSCALE defaults (0,1); handle NULL argument to gfits_print/modify string functions with an error not a crash

File:

• branches/eam_branches/ipp-20111122/Ohana/src/libfits/header/F_modify.c (modified) (6 diffs)

branches/eam_branches/ipp-20111122/Ohana/src/libfits/header/F_modify.c

@@ -70 +70 @@
   /* string value.  Quotes must be at least 18 chars apart */
   if (!strcmp (mode, "%s")) {
-    strncpy (data, va_arg (argp, char *), 68);
+    char *ptr = va_arg (argp, char *);
+    if (!ptr) goto invalid;
+    strncpy (data, ptr, 68);
     snprintf (string, 81, "%-8s= '%-18s' / %-s ", field, data, comment);
     goto found_it;
@@ -76 +78 @@
 
   /* failed to find mode */
+invalid:
+  va_end (argp);
   return (FALSE);
 
@@ -82 +86 @@
   va_end (argp);
   return (TRUE);
-
 }
 
@@ -143 +146 @@
   /* comment type of value.  */
   if (!strcmp (mode, "%S")) {
-    strncpy (data, va_arg (argp, char *), 71);
+    char *ptr = va_arg (argp, char *);
+    if (!ptr) goto invalid;
+    strncpy (data, ptr, 71);
     snprintf (string, 81, "%-8s %-71s", field, data);
   }  
@@ -157 +162 @@
 
     strncpy (data, qs, MAX (MIN (qe - qs, 71), 0));
-    strncpy (comment, va_arg (argp, char *), 80);
+
+    char *ptr = va_arg (argp, char *);
+    if (!ptr) goto invalid;
+    strncpy (comment, ptr, 80);
     gfits_pad_ending (comment, ' ', 82);  /* comment must contain spaces to the end */
     snprintf (string, 81, "%-8s= %s / %-s", field, data, comment);
@@ -167 +175 @@
   return (TRUE);
 
+invalid:
+  va_end (argp);
+  return (FALSE);
 }