aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2011-06-14 16:18:53 -0700
committerPaul Eggert2011-06-14 16:18:53 -0700
commit566684ead5a577f6b2506f242494f2fa57eb5a49 (patch)
tree2fafc64eb64a98fdf32f7738d0f7e8a3e0740821 /src
parentde41a8106952ceb1d14dd25564fa5eba1ced9110 (diff)
downloademacs-566684ead5a577f6b2506f242494f2fa57eb5a49.tar.gz
emacs-566684ead5a577f6b2506f242494f2fa57eb5a49.zip
* fns.c (Fload_average): Don't assume 100 * load average fits in int.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/fns.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 5cb9384f6fb..35dab796be7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
12011-06-14 Paul Eggert <eggert@cs.ucla.edu> 12011-06-14 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 * fns.c (Fload_average): Don't assume 100 * load average fits in int.
4
3 * fns.c: Don't overflow int when computing a list length. 5 * fns.c: Don't overflow int when computing a list length.
4 * fns.c (QUIT_COUNT_HEURISTIC): New constant. 6 * fns.c (QUIT_COUNT_HEURISTIC): New constant.
5 (Flength, Fsafe_length): Use EMACS_INT, not int, to avoid unwanted 7 (Flength, Fsafe_length): Use EMACS_INT, not int, to avoid unwanted
diff --git a/src/fns.c b/src/fns.c
index 69b95cba09c..a19c886e3e1 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -2542,8 +2542,8 @@ advisable. */)
2542 2542
2543 while (loads-- > 0) 2543 while (loads-- > 0)
2544 { 2544 {
2545 Lisp_Object load = (NILP (use_floats) ? 2545 Lisp_Object load = (NILP (use_floats)
2546 make_number ((int) (100.0 * load_ave[loads])) 2546 ? make_number (100.0 * load_ave[loads])
2547 : make_float (load_ave[loads])); 2547 : make_float (load_ave[loads]));
2548 ret = Fcons (load, ret); 2548 ret = Fcons (load, ret);
2549 } 2549 }