diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2005-12-14 20:49:46 +0000 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2005-12-14 20:49:46 +0000 |
| commit | 9b98e161251e6d57205ff95ea19c2f07737f80da (patch) | |
| tree | 036c919b99b84711e2fc4881ef4863be83a6ab1b /src | |
| parent | c94dca60212b9586a723dd293a02553adf052b75 (diff) | |
| download | emacs-9b98e161251e6d57205ff95ea19c2f07737f80da.tar.gz | |
* print.c (print_preprocess): Go to a deeper print_depth to avoid
print_object loop.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/print.c | 8 |
2 files changed, 13 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 90d782faa20..b26416b7839 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,7 +1,13 @@ +2005-12-14 Chong Yidong <cyd@stupidchicken.com> + + * print.c (print_preprocess): Go to a deeper print_depth to avoid + print_object loop. + 2005-12-14 Kyotaro HORIGUCHI <horiguti@meadowy.org> (tiny change) * coding.c (code_convert_region_unwind): GCPRO arg. +>>>>>>> 1.4762 2005-12-12 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> * xfns.c (compute_tip_xy): Calculate root_y the same way as root_x, diff --git a/src/print.c b/src/print.c index d563580ddd3..ed6b402763a 100644 --- a/src/print.c +++ b/src/print.c @@ -1313,7 +1313,13 @@ print_preprocess (obj) /* Give up if we go so deep that print_object will get an error. */ /* See similar code in print_object. */ - if (print_depth >= PRINT_CIRCLE) + /* Because print_preprocess "follows" nested lists in a slightly + different order from print_object, there is a risk of giving up + too soon. In that case, a deeply nested circular list may cause + print_object to loop. Using 3 * PRINT_CIRCLE should make this + possibility negligible, but at some point someone will have to + sit down and do a more careful analysis. -- cyd */ + if (print_depth >= 3 * PRINT_CIRCLE) return; /* Avoid infinite recursion for circular nested structure |