# HG changeset patch # User Jerry James # Date 1417823773 25200 # Node ID e24390bd42354fa2947ebaa5adecd0dbacbed5de # Parent 7984e732829e22395c87d8b0354f4140cbe67209 Fix off-by-one error in Ffile_truename. See in xemacs-patches. diff -r 7984e732829e -r e24390bd4235 src/ChangeLog --- a/src/ChangeLog Fri Dec 05 16:22:57 2014 -0700 +++ b/src/ChangeLog Fri Dec 05 16:56:13 2014 -0700 @@ -1,3 +1,7 @@ +2014-12-05 Jerry James + + * src/fileio.c (Ffile_truename): Fix off-by-one error. + 2014-11-23 Michael Sperber * font-mgr.c (Ffc_name_unparse): Do the previous change to this diff -r 7984e732829e -r e24390bd4235 src/fileio.c --- a/src/fileio.c Fri Dec 05 16:22:57 2014 -0700 +++ b/src/fileio.c Fri Dec 05 16:56:13 2014 -0700 @@ -1466,7 +1466,7 @@ if (elen > 0 && IS_DIRECTORY_SEP (string_byte (expanded_name, elen - 1)) && !(rlen > 0 && IS_DIRECTORY_SEP (resolved_path[rlen - 1]))) { - if (rlen + 1 > countof (resolved_path)) + if (rlen + 1 >= countof (resolved_path)) goto toolong; resolved_path[rlen++] = DIRECTORY_SEP; resolved_path[rlen] = '\0';