7 files changed, 95 insertions, 53 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index cf75596f422..f7f68b41838 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -29,8 +29,6 @@
         now that we have two such functions.  All uses changed.
         (sanitize_char_width): New inline function.
 
-2011-07-18  Paul Eggert  <eggert@cs.ucla.edu>
-
         Don't assume that tab-width fits in int.
         * character.h (sanitize_width): New inline function.
         (SANE_TAB_WIDTH): New macro.
@@ -46,8 +44,6 @@
         Remove unreachable code.
         (read_hex, load_charset_map_from_file): Check for integer overflow.
 
-2011-07-17  Paul Eggert  <eggert@cs.ucla.edu>
-
         * xterm.c: don't go over XClientMessageEvent limit
         (scroll_bar_windows_size): Now ptrdiff_t, as we prefer signed.
         (x_send_scroll_bar_event): Likewise.  Check that the size does not
@@ -110,8 +106,6 @@
         (gs_load): Use printmax_t to print the widest integers possible.
         Check for integer overflow when computing image height and width.
 
-2011-07-17  Paul Eggert  <eggert@cs.ucla.edu>
-
         Integer signedness and overflow and related fixes.  (Bug#9079)
 
         * bidi.c: Integer size and overflow fixes.
@@ -309,6 +303,36 @@
         Use EMACS_INT, not EMACS_UINT, for sizes.  The code works equally
         well either way, and we prefer signed to unsigned.
 
+2011-07-18  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * fileio.c (Fcopy_file) [!MSDOS]: Tighten created file's mask.
+        This fixes some race conditions on the permissions of any newly
+        created file.
+
+        * alloc.c (valid_pointer_p): Use pipe, not open.
+        This fixes some permissions issues when debugging.
+
+        * fileio.c (Fcopy_file): Adjust mode if fchown fails.  (Bug#9002)
+        If fchown fails to set both uid and gid, try to set just gid,
+        as that is sometimes allowed.  Adjust the file's mode to eliminate
+        setuid or setgid bits that are inappropriate if fchown fails.
+
+2011-07-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * xdisp.c (next_element_from_string, next_element_from_buffer): Use EQ
+        to compare Lisp_Objects.
+        * gnutls.c (syms_of_gnutls): Rename Vgnutls_log_level to
+        global_gnutls_log_level, don't mistake it for a Lisp_Object.
+        (init_gnutls_functions, emacs_gnutls_handle_error): Fix up uses.
+
+2011-07-17  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * lread.c (read_integer): Unread even EOF character.
+        (read1): Likewise.  Properly record start position of symbol.
+
+        * lread.c (read1): Read `#:' as empty uninterned symbol if no
+        symbol character follows.
+
 2011-07-17  Paul Eggert  <eggert@cs.ucla.edu>
 
         * fileio.c (Fcopy_file): Pacify gcc re fchown.  (Bug#9002)
diff --git a/src/alloc.c b/src/alloc.c
index 5848e797b4b..eb0185a8e35 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -4430,18 +4430,18 @@ valid_pointer_p (void *p)
 #ifdef WINDOWSNT
   return w32_valid_pointer_p (p, 16);
 #else
-  int fd;
+  int fd[2];
 
   /* Obviously, we cannot just access it (we would SEGV trying), so we
      trick the o/s to tell us whether p is a valid pointer.
      Unfortunately, we cannot use NULL_DEVICE here, as emacs_write may
      not validate p in that case.  */
 
-  if ((fd = emacs_open ("__Valid__Lisp__Object__", O_CREAT | O_WRONLY | O_TRUNC, 0666)) >= 0)
+  if (pipe (fd) == 0)
     {
-      int valid = (emacs_write (fd, (char *)p, 16) == 16);
-      emacs_close (fd);
-      unlink ("__Valid__Lisp__Object__");
+      int valid = (emacs_write (fd[1], (char *) p, 16) == 16);
+      emacs_close (fd[1]);
+      emacs_close (fd[0]);
       return valid;
     }
 
diff --git a/src/fileio.c b/src/fileio.c
index af11e927059..60ee35bb399 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -38,8 +38,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <selinux/context.h>
 #endif
 
-#include <ignore-value.h>
-
 #include "lisp.h"
 #include "intervals.h"
 #include "buffer.h"
@@ -1939,10 +1937,19 @@ on the system, we copy the SELinux context of FILE to NEWNAME.  */)
                     | (NILP (ok_if_already_exists) ? O_EXCL : 0),
                     S_IREAD | S_IWRITE);
 #else  /* not MSDOS */
-  ofd = emacs_open (SSDATA (encoded_newname),
-                    O_WRONLY | O_TRUNC | O_CREAT
-                    | (NILP (ok_if_already_exists) ? O_EXCL : 0),
-                    0666);
+  {
+    int new_mask = 0666;
+    if (input_file_statable_p)
+      {
+        if (!NILP (preserve_uid_gid))
+          new_mask = 0600;
+        new_mask &= st.st_mode;
+      }
+    ofd = emacs_open (SSDATA (encoded_newname),
+                      (O_WRONLY | O_TRUNC | O_CREAT
+                       | (NILP (ok_if_already_exists) ? O_EXCL : 0)),
+                      new_mask);
+  }
 #endif /* not MSDOS */
   if (ofd < 0)
     report_file_error ("Opening output file", Fcons (newname, Qnil));
@@ -1961,9 +1968,21 @@ on the system, we copy the SELinux context of FILE to NEWNAME.  */)
      owner and group.  */
   if (input_file_statable_p)
     {
+      int mode_mask = 07777;
       if (!NILP (preserve_uid_gid))
-        ignore_value (fchown (ofd, st.st_uid, st.st_gid));
-      if (fchmod (ofd, st.st_mode & 07777) != 0)
+        {
+          /* Attempt to change owner and group.  If that doesn't work
+             attempt to change just the group, as that is sometimes allowed.
+             Adjust the mode mask to eliminate setuid or setgid bits
+             that are inappropriate if the owner and group are wrong.  */
+          if (fchown (ofd, st.st_uid, st.st_gid) != 0)
+            {
+              mode_mask &= ~06000;
+              if (fchown (ofd, -1, st.st_gid) == 0)
+                mode_mask |= 02000;
+            }
+        }
+      if (fchmod (ofd, st.st_mode & mode_mask) != 0)
         report_file_error ("Doing chmod", Fcons (newname, Qnil));
     }
 #endif  /* not MSDOS */
diff --git a/src/gnutls.c b/src/gnutls.c
index 52e80a69ae5..3175f55041d 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -193,8 +193,7 @@ init_gnutls_functions (Lisp_Object libraries)
   LOAD_GNUTLS_FN (library, gnutls_x509_crt_import);
   LOAD_GNUTLS_FN (library, gnutls_x509_crt_init);
 
-  if (NUMBERP (Vgnutls_log_level))
-    max_log_level = XINT (Vgnutls_log_level);
+  max_log_level = global_gnutls_log_level;
 
   GNUTLS_LOG2 (1, max_log_level, "GnuTLS library loaded:",
                SDATA (Fget (Qgnutls_dll, QCloaded_from)));
@@ -406,8 +405,7 @@ emacs_gnutls_handle_error (gnutls_session_t session, int err)
   if (err >= 0)
     return 0;
 
-  if (NUMBERP (Vgnutls_log_level))
-    max_log_level = XINT (Vgnutls_log_level);
+  max_log_level = global_gnutls_log_level;
 
   /* TODO: use gnutls-error-fatalp and gnutls-error-string.  */
 
@@ -1155,9 +1153,9 @@ syms_of_gnutls (void)
   defsubr (&Sgnutls_bye);
   defsubr (&Sgnutls_available_p);
 
-  DEFVAR_INT ("gnutls-log-level", Vgnutls_log_level,
-              doc: /* Logging level used by the GnuTLS functions. */);
-  Vgnutls_log_level = make_number (0);
+  DEFVAR_INT ("gnutls-log-level", global_gnutls_log_level,
+              doc: /* Logging level used by the GnuTLS functions.  */);
+  global_gnutls_log_level = 0;
 }
 
 #endif /* HAVE_GNUTLS */
diff --git a/src/lread.c b/src/lread.c
index c80ac430671..c0de95dd121 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -2327,8 +2327,7 @@ read_integer (Lisp_Object readcharfun, EMACS_INT radix)
           c = READCHAR;
         }
 
-      if (c >= 0)
-        UNREAD (c);
+      UNREAD (c);
       *p = '\0';
     }
 
@@ -2583,8 +2582,7 @@ read1 (register Lisp_Object readcharfun, int *pch, int first_in_list)
               nskip *= 10;
               nskip += c - '0';
             }
-          if (c >= 0)
-            UNREAD (c);
+          UNREAD (c);
 
           if (load_force_doc_strings
               && (EQ (readcharfun, Qget_file_char)
@@ -2660,7 +2658,17 @@ read1 (register Lisp_Object readcharfun, int *pch, int first_in_list)
         {
           uninterned_symbol = 1;
           c = READCHAR;
-          goto default_label;
+          if (!(c > 040
+                && c != 0x8a0
+                && (c >= 0200
+                    || strchr ("\"';()[]#`,", c) == NULL)))
+            {
+              /* No symbol character follows, this is the empty
+                 symbol.  */
+              UNREAD (c);
+              return Fmake_symbol (build_string (""));
+            }
+          goto read_symbol;
         }
       /* Reader forms that can reuse previously read objects.  */
       if (c >= '0' && c <= '9')
@@ -2841,7 +2849,7 @@ read1 (register Lisp_Object readcharfun, int *pch, int first_in_list)
         next_char = READCHAR;
         ok = (next_char <= 040
               || (next_char < 0200
-                  && (strchr ("\"';()[]#?`,.", next_char))));
+                  && strchr ("\"';()[]#?`,.", next_char) != NULL));
         UNREAD (next_char);
         if (ok)
           return make_number (c);
@@ -2966,11 +2974,6 @@ read1 (register Lisp_Object readcharfun, int *pch, int first_in_list)
             /* Otherwise, READ_BUFFER contains only ASCII.  */
           }
 
-        /* We want readchar_count to be the number of characters, not
-           bytes.  Hence we adjust for multibyte characters in the
-           string.  ... But it doesn't seem to be necessary, because
-           READCHAR *does* read multibyte characters from buffers. */
-        /* readchar_count -= (p - read_buffer) - nchars; */
         if (read_pure)
           return make_pure_string (read_buffer, nchars, p - read_buffer,
                                    (force_multibyte
@@ -2987,7 +2990,7 @@ read1 (register Lisp_Object readcharfun, int *pch, int first_in_list)
 
         if (next_char <= 040
             || (next_char < 0200
-                && (strchr ("\"';([#?`,", next_char))))
+                && strchr ("\"';([#?`,", next_char) != NULL))
           {
             *pch = c;
             return Qnil;
@@ -3002,9 +3005,12 @@ read1 (register Lisp_Object readcharfun, int *pch, int first_in_list)
       if (c <= 040) goto retry;
       if (c == 0x8a0) /* NBSP */
         goto retry;
+
+    read_symbol:
       {
         char *p = read_buffer;
         int quoted = 0;
+        EMACS_INT start_position = readchar_count - 1;
 
         {
           char *end = read_buffer + read_buffer_size;
@@ -3035,10 +3041,11 @@ read1 (register Lisp_Object readcharfun, int *pch, int first_in_list)
               else
                 *p++ = c;
               c = READCHAR;
-            } while (c > 040
-                     && c != 0x8a0 /* NBSP */
-                     && (c >= 0200
-                         || !(strchr ("\"';()[]#`,", c))));
+            }
+          while (c > 040
+                 && c != 0x8a0 /* NBSP */
+                 && (c >= 0200
+                     || strchr ("\"';()[]#`,", c) == NULL));
 
           if (p == end)
             {
@@ -3051,8 +3058,7 @@ read1 (register Lisp_Object readcharfun, int *pch, int first_in_list)
               end = read_buffer + read_buffer_size;
             }
           *p = 0;
-          if (c >= 0)
-            UNREAD (c);
+          UNREAD (c);
         }
 
         if (!quoted && !uninterned_symbol)
@@ -3080,12 +3086,7 @@ read1 (register Lisp_Object readcharfun, int *pch, int first_in_list)
           if (EQ (Vread_with_symbol_positions, Qt)
               || EQ (Vread_with_symbol_positions, readcharfun))
             Vread_symbol_positions_list =
-              /* Kind of a hack; this will probably fail if characters
-                 in the symbol name were escaped.  Not really a big
-                 deal, though.  */
-              Fcons (Fcons (result,
-                            make_number (readchar_count
-                                         - XFASTINT (Flength (Fsymbol_name (result))))),
+              Fcons (Fcons (result, make_number (start_position)),
                      Vread_symbol_positions_list);
           return result;
         }
diff --git a/src/process.h b/src/process.h
index 4866a8c1022..aff9e970f63 100644
--- a/src/process.h
+++ b/src/process.h
@@ -141,7 +141,7 @@ struct Lisp_Process
 /* Every field in the preceding structure except for the first two
    must be a Lisp_Object, for GC's sake.  */
 
-#define ChannelMask(n) (1<<(n))
+#define ChannelMask(n) (1 << (n))
 
 /* True if we are about to fork off a synchronous process or if we
    are waiting for it.  */
diff --git a/src/xdisp.c b/src/xdisp.c
index 9d521ea7aaf..43f60abb812 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -6942,7 +6942,7 @@ next_element_from_string (struct it *it)
   struct text_pos position;
 
   xassert (STRINGP (it->string));
-  xassert (!it->bidi_p || it->string == it->bidi_it.string.lstring);
+  xassert (!it->bidi_p || EQ (it->string, it->bidi_it.string.lstring));
   xassert (IT_STRING_CHARPOS (*it) >= 0);
   position = it->current.string_pos;
 
@@ -7256,7 +7256,7 @@ next_element_from_buffer (struct it *it)
   xassert (IT_CHARPOS (*it) >= BEGV);
   xassert (NILP (it->string) && !it->s);
   xassert (!it->bidi_p
-           || (it->bidi_it.string.lstring == Qnil
+           || (EQ (it->bidi_it.string.lstring, Qnil)
                && it->bidi_it.string.s == NULL));
 
   /* With bidi reordering, the character to display might not be the