[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-25 5b2401d 07/12: Stop rendering HTML before specdlr
From: |
Lars Ingebrigtsen |
Subject: |
[Emacs-diffs] emacs-25 5b2401d 07/12: Stop rendering HTML before specdlr exhaustion |
Date: |
Fri, 25 Dec 2015 16:06:01 +0000 |
branch: emacs-25
commit 5b2401d38f52ca03c8b43cdfdf5a32ca73f10178
Author: Lars Ingebrigtsen <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>
Stop rendering HTML before specdlr exhaustion
Fixes: 22117
* shr.el (shr-descend): Stop rendering before we run out of
specpdl room (bug#22117).
Backport:
(cherry picked from commit 248da292fe46224b0b5a79b632c89cf4de2c2081)
---
lisp/net/shr.el | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index 8b51fc8..9e86ca9 100644
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -425,8 +425,8 @@ size, and full-buffer size."
(shr-stylesheet shr-stylesheet)
(shr-depth (1+ shr-depth))
(start (point)))
- ;; shr uses about 12 frames per nested node.
- (if (> shr-depth (/ max-specpdl-size 12))
+ ;; shr uses many frames per nested node.
+ (if (> shr-depth (/ max-specpdl-size 15))
(setq shr-warning "Too deeply nested to render properly; consider
increasing `max-specpdl-size'")
(when style
(if (string-match "color\\|display\\|border-collapse" style)
- [Emacs-diffs] emacs-25 updated (cc3de97 -> e59b2ee), Lars Ingebrigtsen, 2015/12/25
- [Emacs-diffs] emacs-25 5bd3a0c 02/12: Add FreeBSD cert bundle, Lars Ingebrigtsen, 2015/12/25
- [Emacs-diffs] emacs-25 6ef896c 01/12: Ignore invalid SVG images, Lars Ingebrigtsen, 2015/12/25
- [Emacs-diffs] emacs-25 90f82ff 03/12: Decode hex-encoded URLs before using them as file names, Lars Ingebrigtsen, 2015/12/25
- [Emacs-diffs] emacs-25 ec2a509 06/12: Use cl-reduce, not reduce., Lars Ingebrigtsen, 2015/12/25
- [Emacs-diffs] emacs-25 96ac314 05/12: Allow several <tbody> tags in shr, Lars Ingebrigtsen, 2015/12/25
- [Emacs-diffs] emacs-25 eeff251 08/12: Don't store cookies with empty names, Lars Ingebrigtsen, 2015/12/25
- [Emacs-diffs] emacs-25 5b2401d 07/12: Stop rendering HTML before specdlr exhaustion,
Lars Ingebrigtsen <=
- [Emacs-diffs] emacs-25 6c12691 11/12: Always save eww history, Lars Ingebrigtsen, 2015/12/25
- [Emacs-diffs] emacs-25 a7143fa 04/12: Make prettier unique file names in eww, Lars Ingebrigtsen, 2015/12/25
- [Emacs-diffs] emacs-25 2d33a9c 09/12: Make toggling checkboxes work again, Lars Ingebrigtsen, 2015/12/25
- [Emacs-diffs] emacs-25 1a99bd6 10/12: Default web pages to right-to-left, Lars Ingebrigtsen, 2015/12/25
- [Emacs-diffs] emacs-25 e59b2ee 12/12: More eww file name coding fixes, Lars Ingebrigtsen, 2015/12/25