From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 24 Feb 2013 00:21:06 +0000 (-0800)
Subject: Fix regression introduced by July 10 filelock.c patch.
X-Git-Tag: emacs-24.3-rc1~25
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/1938d88c74281393f180f7ac3c77418b926ed6e6

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>.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 99b5e8734e..914c005a04 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 f21240f834..ba55c1c146 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))
     {