Amend previous commit.

diff --git a/VERSION b/VERSION
index 60d3b2f4a4cd5f1637eba020358bfe5ecb5edcf2..b6a7d89c68e0ca66e96a9a51892cc33db66fb8a3 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15
+16

diff --git a/tfc_error.c b/tfc_error.c
index 6e2dabf30f9a18cc99a6e9cd4ff37abe5b732cd3..001273e1caed36d3b6b6730c73cd9980f2df4b69 100644 (file)
--- a/tfc_error.c
+++ b/tfc_error.c
@@ -151,7 +151,7 @@ void usage(void)
        tfc_say("convert encrypted data into ASCII format to ease transmission.");
        tfc_say("\n");
        tfc_say("  -e, -d: encrypt, decrypt (it maybe required).");
-       tfc_say("  -L <file>: load tfcrypt defsults from file.");
+       tfc_say("  -L <file>: load tfcrypt defaults from file.");
        tfc_say("    defaults is text file which defines salt, nr_turns and default mode.");
        tfc_say("  -s <file>: load tfcrypt salt from file.");
        tfc_say("  -s disable: disable key salting at all.");

diff --git a/tfcrypt.c b/tfcrypt.c
index 2390516a2ae9b35d7b3715f82e8deb596d7d1c8b..c8664cca99aad14cbc4cb9e84c4bb964483f5b4a 100644 (file)
--- a/tfcrypt.c
+++ b/tfcrypt.c
@@ -65,10 +65,12 @@ int main(int argc, char **argv)
        s = (char *)srcblk;
        d = getenv("HOME");
        if (!d) d = "";
-       xstrlcat(s, d, PATH_MAX > sizeof(srcblk) ? sizeof(srcblk) : PATH_MAX);
-       xstrlcat(s, "/.tfcrypt.defs", PATH_MAX > sizeof(srcblk) ? sizeof(srcblk) : PATH_MAX);
+       n = PATH_MAX > sizeof(srcblk) ? sizeof(srcblk) : PATH_MAX;
+       if (xstrlcpy(s, d, n) >= n) goto _baddfname;
+       if (xstrlcat(s, "/.tfcrypt.defs", n) >= n) goto _baddfname;
        read_defaults(s, YES);
-       memset(s, 0, PATH_MAX > sizeof(srcblk) ? sizeof(srcblk) : PATH_MAX);
+_baddfname:
+       memset(s, 0, n);
 
        opterr = 0;
        while ((c = getopt(argc, argv, "L:s:aU:C:r:K:t:TPkzxc:l:qedn:vV:pwE:O:S:AmM:R:Z:WHD:")) != -1) {