Changeset 40498 for trunk

Timestamp:

Jul 6, 2018, 1:06:27 PM (8 years ago)

Author:

eugene

Message:

do not let format overflow string size

Location:

trunk/Ohana/src

Files:

• addstar/src/sky_tessalation.c (modified) (2 diffs)
• libdvo/src/dvo_util.c (modified) (2 diffs)

trunk/Ohana/src/addstar/src/sky_tessalation.c

@@ -815 +815 @@
 
   int i, j, N, NX, NY, Ndigit;
-  char format[24];
+  char format[80];
 
   NX = input[0].NX/(double)Nx + 0.5;
@@ -829 +829 @@
   if (Nx * Ny > 1) {
     Ndigit = (int)(log10(Nx*Ny)) + 1 ;
-    snprintf (format, 24, "%s.%%0%dd", input[0].name, Ndigit);
+    snprintf (format, 80, "%s.%%0%dd", input[0].name, Ndigit);
   } else {
-    snprintf (format, 24, "%s", input[0].name);
+    snprintf (format, 80, "%s", input[0].name);
   }
 

trunk/Ohana/src/libdvo/src/dvo_util.c

@@ -60 +60 @@
   }
 
-  snprintf (dvoConfig->photcodeFile, 256, "%s/Photcodes.dat", dvoConfig->catdir);
+  // photcodeFile[] must be > catdir[]
+  snprintf (dvoConfig->photcodeFile, 280, "%s/Photcodes.dat", dvoConfig->catdir);
   if (!LoadPhotcodes (dvoConfig->photcodeFile, MasterPhotcodeFile, FALSE)) {
     fprintf (stderr, "error loading photcode table %s or master file %s\n",
@@ -95 +96 @@
   }
 
-  char filename[256];
+  char filename[280];
   
-  snprintf (filename, 256, "%s/Images.dat", dvoConfig->catdir);
+  snprintf (filename, 280, "%s/Images.dat", dvoConfig->catdir);
 
   gfits_db_init (&dvoConfig->imageDB);