Changeset 39324 for trunk/Ohana/src/libfits/header/F_scan.c

Timestamp:

Jan 27, 2016, 11:18:36 AM (11 years ago)

Author:

eugene

Message:

trying to catch memory corruption by being extra pedantic

File:

• trunk/Ohana/src/libfits/header/F_scan.c (modified) (10 diffs)

trunk/Ohana/src/libfits/header/F_scan.c

@@ -44 +44 @@
   if (p[8] != '=') return (FALSE);
 
+  s = gfits_keyword_start (p); /* points at first char (not ') */
+  q = gfits_keyword_end (p); /* points at following space or ' */
+
+  // these are invalid conditions:
+  if (s - p > 80) return FALSE;
+  if (q - p > 80) return FALSE;
+
   /* extract data into char array (exclude containing ' chars) */
+  Nchar = MIN (80, MAX (0, (q - s)));
+  bzero (tmp, 81);
+  memcpy (tmp, s, Nchar);
+
+  // for string types, copy the data to the target pointer
   if (!strcmp (mode, "%s")) {
-    s = gfits_keyword_start (p); /* points at first char (not ') */
-    q = gfits_keyword_end (p); /* points at following space or ' */
-
-    Nchar = MAX (0, (q - s));
-    bzero (tmp, 81);
-    memcpy (tmp, s, Nchar);
     stripwhite (tmp);
     strcpy (va_arg (argp, char *), tmp);
@@ -59 +65 @@
   /* remaining options are numerical data */
   /* need to interpret 1.0d5 as 1.0e5 */
-  s = gfits_keyword_start (p); /* points at first char (not ') */
-  q = gfits_keyword_end (p); /* points at following space or ' */
 
   if (!strcmp (mode, "%f") || !strcmp (mode, "%lf")) {
-    fvalue = strtod (s, &q);
-    if ((*q == 'd') || (*q == 'D')) 
-      fvalue *= pow (10.0, atof (q + 1));
+    fvalue = strtod (tmp, &q);
+    if ((*q == 'd') || (*q == 'D')) fvalue *= pow (10.0, atof (q + 1));
 
     if (!strcmp (mode, "%f"))   { *va_arg (argp, float *)  = fvalue; return (TRUE); }
@@ -71 +74 @@
   }
 
-  value = strtoll (s, &q, 0);
+  value = strtoll (tmp, &q, 0);
   if ((*q == 'd') || (*q == 'D')) value *= pow (10.0, atof (q + 1));
 
@@ -96 +99 @@
 int gfits_vscan_alt (Header *header, char *field, char *mode, int N, va_list argp) {
 
-  char *p, *q, *s, tmp[81];
+  char *p, *q, *s, tmp[128];
   int Nchar, status;
 
@@ -117 +120 @@
   /* comment from data line */
   if (!strcmp (mode, "%C")) {
-    q = gfits_keyword_end (p) + 3;
+    q = gfits_keyword_end (p);
+    if (!q) return (FALSE);
+    q += 3;
     q = MIN (p + 80, q);
     bzero (tmp, 81);
-    Nchar = MIN (80, p + 80 - q);
+    Nchar = MAX (0, MIN (80, p + 80 - q));
     memcpy (tmp, q, Nchar);
     stripwhite (tmp);
@@ -147 +152 @@
 int gfits_vscan_hierarch (Header *header, char *field, char *mode, int N, va_list argp) {
 
-  char *p, *q, *s, tmp[81];
+  char *p, *q, *s, tmp[128];
   int Nchar, Nfield;
   long long value;
@@ -172 +177 @@
     q = MIN (p + HIERARCH_LENGTH, q);
     bzero (tmp, 81);
-    Nchar = MIN (HIERARCH_LENGTH, p + HIERARCH_LENGTH - q);
+    Nchar = MAX (0, MIN (HIERARCH_LENGTH, p + HIERARCH_LENGTH - q));
     memcpy (tmp, q, Nchar);
     stripwhite (tmp);
@@ -179 +184 @@
   }
 
-  /* extract data into char array (exclude containing ' chars) */
-  if (!strcmp (mode, "%s")) {
-    s = gfits_hierarch_keyword_start (p, field); /* points at first char (not ') */
-    q = gfits_hierarch_keyword_end (p, field); /* points at following space or ' */
-
-    Nchar = MIN (HIERARCH_LENGTH, MAX (0, (q - s)));
-    bzero (tmp, 81);
-    memcpy (tmp, s, Nchar);
-    stripwhite (tmp);
-    strcpy (va_arg (argp, char *), tmp);
-    return (TRUE);
-  }
-  
+  s = gfits_hierarch_keyword_start (p, field); /* points at first char (not ') */
+  q = gfits_hierarch_keyword_end (p, field); /* points at following space or ' */
+
+  // these are invalid conditions:
+  if (s - p > 80) return FALSE;
+  if (q - p > 80) return FALSE;
+
   /* boolean data, requires int target */
   if (!strcmp (mode, "%t")) {
-    s = gfits_hierarch_keyword_start (p, field);
     if (*s == 'T') {
       *va_arg (argp, int *) = TRUE;
@@ -205 +203 @@
   }
 
+  /* extract data into char array (exclude containing ' chars) */
+  Nchar = MIN (HIERARCH_LENGTH, MAX (0, (q - s)));
+  bzero (tmp, 81);
+  memcpy (tmp, s, Nchar);
+
+  // for string types, copy the data to the target pointer
+  if (!strcmp (mode, "%s")) {
+    stripwhite (tmp);
+    strcpy (va_arg (argp, char *), tmp);
+    return (TRUE);
+  }
+  
   /* remaining options are numerical data */
   /* need to interpret 1.0d5 as 1.0e5 */
-  s = gfits_hierarch_keyword_start (p, field); /* points at first char (not ') */
-  q = gfits_hierarch_keyword_end (p, field); /* points at following space or ' */
 
   if (!strcmp (mode, "%f") || !strcmp (mode, "%lf")) {
-    fvalue = strtod (s, &q);
-    if ((*q == 'd') || (*q == 'D')) 
-      fvalue *= pow (10.0, atof (q + 1));
+    fvalue = strtod (tmp, &q);
+    if ((*q == 'd') || (*q == 'D')) fvalue *= pow (10.0, atof (q + 1));
 
     if (!strcmp (mode, "%f"))   { *va_arg (argp, float *)  = fvalue; return (TRUE); }
@@ -219 +226 @@
   }
 
-  value = strtoll (s, &q, 0);
+  value = strtoll (tmp, &q, 0);
   if ((*q == 'd') || (*q == 'D')) value *= pow (10.0, atof (q + 1));