Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-216
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-217
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-218
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-219
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-220
   Improve tq.el.

 * emacs@sv.gnu.org/emacs--devo--0--patch-221
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-222
   Update from CVS: src/puresize.h (PURESIZE_RATIO): Reduce to 10/6.

 * emacs@sv.gnu.org/emacs--devo--0--patch-223
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-224
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-225
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-226
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-227
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-228
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-229
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-230
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-231
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-232
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-233
   Update from CVS: lisp/progmodes/python.el (python-mode): Fix typo.

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-84
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-85
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-86
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-550

1 files changed, 11 insertions, 3 deletions

diff --git a/src/process.c b/src/process.c
index 003f27b77b8..6e633a5825c 100644
--- a/src/process.c
+++ b/src/process.c
@@ -2322,7 +2322,11 @@ get_lisp_to_sockaddr_size (address, familyp)
 }
 
 /* Convert an address object (vector or string) to an internal sockaddr.
-   Format of address has already been validated by size_lisp_to_sockaddr.  */
+
+   The address format has been basically validated by
+   get_lisp_to_sockaddr_size, but this does not mean FAMILY is valid;
+   it could have come from user data.  So if FAMILY is not valid,
+   we return after zeroing *SA.  */
 
 static void
 conv_lisp_to_sockaddr (family, address, sa, len)
@@ -2336,7 +2340,6 @@ conv_lisp_to_sockaddr (family, address, sa, len)
   register int i;
 
   bzero (sa, len);
-  sa->sa_family = family;
 
   if (VECTORP (address))
     {
@@ -2348,6 +2351,7 @@ conv_lisp_to_sockaddr (family, address, sa, len)
           i = XINT (p->contents[--len]);
           sin->sin_port = htons (i);
           cp = (unsigned char *)&sin->sin_addr;
+          sa->sa_family = family;
         }
 #ifdef AF_INET6
       else if (family == AF_INET6)
@@ -2363,9 +2367,10 @@ conv_lisp_to_sockaddr (family, address, sa, len)
                 int j = XFASTINT (p->contents[i]) & 0xffff;
                 ip6[i] = ntohs (j);
               }
-          return;
+          sa->sa_family = family;
         }
 #endif
+      return;
     }
   else if (STRINGP (address))
     {
@@ -2376,6 +2381,7 @@ conv_lisp_to_sockaddr (family, address, sa, len)
           cp = SDATA (address);
           for (i = 0; i < sizeof (sockun->sun_path) && *cp; i++)
             sockun->sun_path[i] = *cp++;
+          sa->sa_family = family;
         }
 #endif
       return;
@@ -6236,6 +6242,8 @@ text to PROCESS after you call this function.  */)
       emacs_close (XINT (XPROCESS (proc)->outfd));
 #endif /* not HAVE_SHUTDOWN */
       new_outfd = emacs_open (NULL_DEVICE, O_WRONLY, 0);
+      if (new_outfd < 0)
+        abort ();
       old_outfd = XINT (XPROCESS (proc)->outfd);
 
       if (!proc_encode_coding_system[new_outfd])