diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2013-02-23 16:21:06 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2013-02-23 16:21:06 -0800 |
| commit | 1938d88c74281393f180f7ac3c77418b926ed6e6 (patch) | |
| tree | 19a487f4c7375983aaea1b313d70dfb187e8baae | |
| parent | da35c2b26f55a329329792f21a297aa8ad08fb95 (diff) | |
| download | emacs-1938d88c74281393f180f7ac3c77418b926ed6e6.tar.gz | |
Fix regression introduced by July 10 filelock.c patch.
* filelock.c (fill_in_lock_file_name): Fix crash caused by the
2012-07-10 patch to this file. Reported by Eli Zaretskii in
<http://lists.gnu.org/archive/html/emacs-devel/2013-02/msg00533.html>
and diagnosed by Andreas Schwab in
<http://lists.gnu.org/archive/html/emacs-devel/2013-02/msg00534.html>.
| -rw-r--r-- | src/ChangeLog | 9 | ||||
| -rw-r--r-- | src/filelock.c | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 99b5e8734e9..914c005a046 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,12 @@ +2013-02-24 Paul Eggert <eggert@cs.ucla.edu> + + Fix regression introduced by July 10 filelock.c patch. + * filelock.c (fill_in_lock_file_name): Fix crash caused by the + 2012-07-10 patch to this file. Reported by Eli Zaretskii in + <http://lists.gnu.org/archive/html/emacs-devel/2013-02/msg00533.html> + and diagnosed by Andreas Schwab in + <http://lists.gnu.org/archive/html/emacs-devel/2013-02/msg00534.html>. + 2013-02-18 Eli Zaretskii <eliz@gnu.org> * w32proc.c (new_child): Avoid leaking handles if the subprocess diff --git a/src/filelock.c b/src/filelock.c index f21240f8340..ba55c1c146a 100644 --- a/src/filelock.c +++ b/src/filelock.c @@ -316,7 +316,7 @@ fill_in_lock_file_name (register char *lockfile, register Lisp_Object fn) p[1] = '.'; p[2] = '#'; - p = p + length + 2; + p = lockfile + length + 2; while (lstat (lockfile, &st) == 0 && !S_ISLNK (st.st_mode)) { |