[Emacs-diffs] /srv/bzr/emacs/emacs-24 r111294: Fix regression introduced by July 10 filelock.c patch.

[Paul Eggert]

------------------------------------------------------------
revno: 111294
committer: Paul Eggert <address@hidden>
branch nick: emacs-24
timestamp: Sat 2013-02-23 16:21:06 -0800
message:
  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>.
modified:
  src/ChangeLog
  src/filelock.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-02-18 16:38:50 +0000
+++ b/src/ChangeLog     2013-02-24 00:21:06 +0000
@@ -1,3 +1,12 @@
+2013-02-24  Paul Eggert  <address@hidden>
+
+       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  <address@hidden>
 
        * w32proc.c (new_child): Avoid leaking handles if the subprocess

=== modified file 'src/filelock.c'
--- a/src/filelock.c    2013-01-01 09:11:05 +0000
+++ b/src/filelock.c    2013-02-24 00:21:06 +0000
@@ -316,7 +316,7 @@
   p[1] = '.';
   p[2] = '#';
 
-  p = p + length + 2;
+  p = lockfile + length + 2;
 
   while (lstat (lockfile, &st) == 0 && !S_ISLNK (st.st_mode))
     {