(Ffile_attributes): Don't allow the device number become negative.

7412d429 · Eli Zaretskii · 83affd96 · 7412d429 · 7412d429
Commit 7412d429 authored May 03, 2008 by Eli Zaretskii
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 2 deletions

src/ChangeLog src/ChangeLog +5 -0

src/dired.c src/dired.c +5 -2

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
+2008-05-03  Eli Zaretskii  <eliz@gnu.org>
+
+	* dired.c (Ffile_attributes): Don't allow the device number become
+	negative.
+
 2008-05-02  Daiki Ueno  <ueno@unixuser.org>

 	* Makefile.in (lisp, shortlisp): Add epa-file-hook.elc.

--- a/src/dired.c
+++ b/src/dired.c
@@ -1048,8 +1048,11 @@ Elements of the attribute list are:
 				 make_number (low_ino & 0xffff)));
    }

-  /* Likewise for device.  */
-  if (FIXNUM_OVERFLOW_P (s.st_dev))
+  /* Likewise for device, but don't let it become negative.  We used
+     to use FIXNUM_OVERFLOW_P here, but that won't catch large
+     positive numbers such as 0xFFEEDDCC.  */
+  if ((EMACS_INT)s.st_dev < 0
+      || (EMACS_INT)s.st_dev > MOST_POSITIVE_FIXNUM)
    values[11] = Fcons (make_number (s.st_dev >> 16),
 			make_number (s.st_dev & 0xffff));
  else