[Emacs-diffs] emacs/lisp ChangeLog net/tramp-compat.el

[Sam Steingold]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Sam Steingold <sds>     09/10/06 19:52:20

Modified files:
        lisp           : ChangeLog 
        lisp/net       : tramp-compat.el 

Log message:
        (tramp-compat-process-running-p): Check that
        the comm attribute is present before calling regexp-quote.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16375&r2=1.16376
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/net/tramp-compat.el?cvsroot=emacs&r1=1.16&r2=1.17

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16375
retrieving revision 1.16376
diff -u -b -r1.16375 -r1.16376
--- ChangeLog   6 Oct 2009 11:15:01 -0000       1.16375
+++ ChangeLog   6 Oct 2009 19:52:15 -0000       1.16376
@@ -1,3 +1,8 @@
+2009-10-06  Sam Steingold  <address@hidden>
+
+       * net/tramp-compat.el (tramp-compat-process-running-p): Check that
+       the comm attribute is present before calling regexp-quote.
+
 2009-10-06  Juanma Barranquero  <address@hidden>
 
        * play/animate.el (animate-string): For good effect, make sure

Index: net/tramp-compat.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/net/tramp-compat.el,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- net/tramp-compat.el 16 Sep 2009 03:13:59 -0000      1.16
+++ net/tramp-compat.el 6 Oct 2009 19:52:20 -0000       1.17
@@ -312,15 +312,15 @@
        (dolist (pid (funcall (symbol-function 'list-system-processes)) result)
          (let ((attributes
                 (funcall (symbol-function 'process-attributes) pid)))
-           (when
-               (and (string-equal
+           (when (and (string-equal
                      (cdr (assoc 'user attributes)) (user-login-name))
+                       (let ((comm (cdr (assoc 'comm attributes))))
                     ;; The returned command name could be truncated
                     ;; to 15 characters.  Therefore, we cannot check
                     ;; for `string-equal'.
-                    (string-match
-                     (concat "^" (regexp-quote (cdr (assoc 'comm attributes))))
-                     process-name))
+                         (and comm (string-match
+                                    (concat "^" (regexp-quote comm))
+                                    process-name))))
              (setq result t))))))
 
      ;; Fallback, if there is no Lisp support yet.