Avoid a race condition in url-queue-kill-job

* url-queue.el (url-queue-kill-job): Delete the process sentinel
before killing the process to avoid a race condition between the
two processes killing off the process buffer.

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index e57b5eccbc29e6ce4e0370872569f4c0f7f2aa2b..55aa91949042b962ad8f44aa98921f039ff9f86e 100644 (file)
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,5 +1,9 @@
 2012-02-20  Lars Ingebrigtsen  <larsi@gnus.org>
 
+       * url-queue.el (url-queue-kill-job): Delete the process sentinel
+       before killing the process to avoid a race condition between the
+       two processes killing off the process buffer.
+
        * url.el (url-retrieve-internal): Warn about file errors when
        pruning the cache instead of bugging out (bug#10831).
 

diff --git a/lisp/url/url-queue.el b/lisp/url/url-queue.el
index 6456d44c423a4ae3b415fe3a1ff1fd8f4da0e589..6e4cedddaf376b379e68c539866b20ee21be26e5 100644 (file)
--- a/lisp/url/url-queue.el
+++ b/lisp/url/url-queue.el
@@ -152,9 +152,11 @@ The variable `url-queue-timeout' sets a timeout."
 
 (defun url-queue-kill-job (job)
   (when (bufferp (url-queue-buffer job))
-    (while (get-buffer-process (url-queue-buffer job))
-      (ignore-errors
-       (delete-process (get-buffer-process (url-queue-buffer job)))))
+    (let (process)
+      (while (setq process (get-buffer-process (url-queue-buffer job)))
+       (set-process-sentinel process 'ignore)
+       (ignore-errors
+         (delete-process process))))
     (ignore-errors
       (kill-buffer (url-queue-buffer job)))))