Преглед изворни кода

* Be sure the SALTS were present before writing the binary out when in -Q

Bryan Drewery пре 17 година
родитељ
комит
4e863b3b18
1 измењених фајлова са 8 додато и 0 уклоњено
  1. 8 0
      src/binary.c

+ 8 - 0
src/binary.c

@@ -323,6 +323,7 @@ readcfg(const char *cfgfile, bool read_stdin)
   int skip = 0, line = 0, feature = 0;
   bool error = 0;
 
+  settings.salt1[0] = settings.salt2[0] = 0;
   if (!read_stdin)
     printf(STR("Reading '%s' "), cfgfile);
   while ((!feof(f)) && ((buffer = step_thru_file(f)) != NULL)) {
@@ -394,6 +395,13 @@ readcfg(const char *cfgfile, bool read_stdin)
     exit(1);
   }
 
+  /* Was the entire pack read in? */
+  if (!settings.salt1[0] || !settings.salt2[0]) {
+    printf("\n");
+    fprintf(stderr, STR("Missing SALTS\n"));
+    exit(1);
+  }
+
   if (!read_stdin) printf(STR(" Success\n"));
   return 1;
 }