Changeset 33128 for branches/eam_branches/ipp-20111122/Ohana/src/libfits/header/F_print.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_print.c (modified) (5 diffs)

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

@@ -65 +65 @@
   /* string value.  Quotes must be at least 18 chars apart.  Longer lines will this should be fixed to allow arbitrary string lengths, up to 69 chars */
   if (!strcmp (mode, "%s")) {
-    strcpy (line, va_arg (argp, char *));
+    char *ptr = va_arg (argp, char *);
+    if (!ptr) goto invalid;
+    strcpy (line, ptr);
     line[68] = 0;
     snprintf (string, 81, "%-8s= '%-18s' / %46s ", field, line, blank);
     goto found_it;
   }
+
+invalid:
+  va_end (argp);
   return (FALSE);
 
@@ -76 +81 @@
   va_end (argp);
   return (TRUE);
-
 }
 
@@ -130 +134 @@
   if (!strcmp (mode, "%S")) {
     /* we are forcing the entry to be <= 69 char long */
-    strcpy (line, va_arg (argp, char *));
-    line[71] = 0;
+    char *ptr = va_arg (argp, char *);
+    if (!ptr) goto invalid;
+    bzero (line, 80);
+    strncpy (line, ptr, 71);
     snprintf (string, 81, "%-8s %-71s", field, line);
   }  
@@ -146 +152 @@
 
   /* can't write the comment in gfits_print - use gfits_modify */
-  if (!strcmp (mode, "%C")) return (FALSE);
+  if (!strcmp (mode, "%C")) goto invalid;
 
   strncpy (p, string, 80);
@@ -153 +159 @@
   return (TRUE);
 
+invalid:
+  va_end (argp);
+  return (FALSE);
 }