Changeset 40504

Timestamp:

Jul 6, 2018, 4:50:24 PM (8 years ago)

Author:

eugene

Message:

make sure photcodeFile matches sprintf statement

Location:

trunk/Ohana/src/libdvo

Files:

• include/dvo_util.h (modified) (2 diffs)
• src/dvo_util.c (modified) (1 diff)

trunk/Ohana/src/libdvo/include/dvo_util.h

@@ -7 +7 @@
 
 #include <dvo.h>
+#define PHOTCODE_FILE_SIZE 280
 
 typedef struct {
@@ -13 +14 @@
   char        catmode[256];
   char        catformat[256];
-  char        photcodeFile[256];
+  char        photcodeFile[PHOTCODE_FILE_SIZE];
   char        skyTableFile[256];
   int         skyDepth;

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

@@ -61 +61 @@
 
   // photcodeFile[] must be > catdir[]
-  snprintf (dvoConfig->photcodeFile, 280, "%s/Photcodes.dat", dvoConfig->catdir);
+  snprintf (dvoConfig->photcodeFile, PHOTCODE_FILE_SIZE, "%s/Photcodes.dat", dvoConfig->catdir);
   if (!LoadPhotcodes (dvoConfig->photcodeFile, MasterPhotcodeFile, FALSE)) {
     fprintf (stderr, "error loading photcode table %s or master file %s\n",