diff options
| author | Paul Eggert | 2011-06-14 16:18:53 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-06-14 16:18:53 -0700 |
| commit | 566684ead5a577f6b2506f242494f2fa57eb5a49 (patch) | |
| tree | 2fafc64eb64a98fdf32f7738d0f7e8a3e0740821 /src | |
| parent | de41a8106952ceb1d14dd25564fa5eba1ced9110 (diff) | |
| download | emacs-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/ChangeLog | 2 | ||||
| -rw-r--r-- | src/fns.c | 4 |
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 @@ | |||
| 1 | 2011-06-14 Paul Eggert <eggert@cs.ucla.edu> | 1 | 2011-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 |
| @@ -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 | } |