bug#18373: desktop-create-buffer: may call bury-buffer on a just killed buffer (?)

bug#18373: desktop-create-buffer: may call bury-buffer on a just killed buffer (?)

[Ivan Shmakov]

[-- Attachment #1: Type: text/plain, Size: 1123 bytes --]

Package:  emacs
Severity: minor
Tags: patch

	Currently, desktop-create-buffer calls bury-buffer on every
	buffer listed in a saved version of (buffer-list) so to restore
	the order of buffers:

  1375 	;; Restore buffer list order with new buffer at end. Don't change
  1376 	;; the order for old desktop files (old desktop module behavior).
  1377 	(unless (< desktop-file-version 206)
  1378 	  (mapc 'bury-buffer buffer-list)
  1379 	  (when result (bury-buffer result)))

	This, however, fails – should one or more of these buffers be
	killed after the list is saved but before it’s processed, – as
	happens with some (presumably temporary) buffers used by
	url-retrieve, which is in turn used while restoring EWW buffers
	per [1].  (Please note that the patch there is broken, though.)

	The patch MIMEd seems to fix the issue for me, although I’m not
	as of yet certain that no buffer can be killed in between the
	buffer-live-p check and the bury-buffer call.

[1] http://debbugs.gnu.org/18010

-- 
FSF associate member #7257  http://boycottsystemd.org/  … 3013 B6A0 230E 334A

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/diff, Size: 539 bytes --]

--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -1375,7 +1375,10 @@ after that many seconds of idle time."
 	;; Restore buffer list order with new buffer at end. Don't change
 	;; the order for old desktop files (old desktop module behavior).
 	(unless (< desktop-file-version 206)
-	  (mapc 'bury-buffer buffer-list)
+	  (mapc (lambda (buf)
+		  (and (buffer-live-p buf)
+		       (bury-buffer buf)))
+		buffer-list)
 	  (when result (bury-buffer result)))
 	(when result
 	  (unless (or desktop-first-buffer (< desktop-file-version 206))

bug#18373: desktop-create-buffer: may call bury-buffer on a just killed buffer (?)

[Stefan Monnier]

Version:24.4

> 	This, however, fails – should one or more of these buffers be
> 	killed after the list is saved but before it’s processed, – as
> 	happens with some (presumably temporary) buffers used by
> 	url-retrieve, which is in turn used while restoring EWW buffers
> 	per [1].  (Please note that the patch there is broken, though.)
> 	The patch MIMEd seems to fix the issue for me, although I’m not
> 	as of yet certain that no buffer can be killed in between the
> 	buffer-live-p check and the bury-buffer call.

Thanks, the patch looks good and safe, so I installed it into `emacs-24'.


        Stefan

bug#18373: desktop-create-buffer: may call bury-buffer on a just killed buffer (?)

[Stefan Monnier]

While this patch was sufficiently small that we could accept it as is,
if you intend to send us further patches (which I hope you do), you may
soon bump into the limit of what we can accept without paperwork.

So I think it might be worthwhile to sign the paperwork now, so that
it's out of the way.  If you agree, then please fill the form below and
send it to the FSF as instructed so they can send you the relevant
paperwork to sign.

And if I already asked you this, then please accept my apologies for
repeating myself.  I'm having a hard time keeping track of these, for
some reason (I guess I should write it down somewhere).


        Stefan


Please email the following information to assign@gnu.org, and we
will send you the assignment form for your past and future changes.

Please use your full legal name (in ASCII characters) as the subject
line of the message.
----------------------------------------------------------------------
REQUEST: SEND FORM FOR PAST AND FUTURE CHANGES

[What is the name of the program or package you're contributing to?]
Emacs

[Did you copy any files or text written by someone else in these changes?
Even if that material is free software, we need to know about it.]


[Do you have an employer who might have a basis to claim to own
your changes?  Do you attend a school which might make such a claim?]


[For the copyright registration, what country are you a citizen of?]


[What year were you born?]


[Please write your email address here.]


[Please write your postal address here.]





[Which files have you changed so far, and which new files have you written
so far?]

bug#18373: desktop-create-buffer: may call bury-buffer on a just killed buffer (?)

[Ivan Shmakov]

>>>>> Stefan Monnier <monnier@IRO.UMontreal.CA> writes:

[…]

 > So I think it might be worthwhile to sign the paperwork now, so that
 > it's out of the way.  If you agree, then please fill the form below
 > and send it to the FSF as instructed so they can send you the
 > relevant paperwork to sign.

	I’ve just got confirmation that my assignment papers are
	processed (at last!)  FTR, the rt.gnu.org ticket is #874240.

[…]

-- 
FSF associate member #7257  http://boycottsystemd.org/  … 3013 B6A0 230E 334A

bug#18373: desktop-create-buffer: may call bury-buffer on a just killed buffer (?)

[Stefan Monnier]

> 	I’ve just got confirmation that my assignment papers are
> 	processed (at last!)  FTR, the rt.gnu.org ticket is #874240.

OK, I see them now.  Great, thank you.
Waiting for your patches now ;-)


        Stefan