diff options
| author | Lars Magne Ingebrigtsen | 2013-12-20 05:29:08 +0100 |
|---|---|---|
| committer | Lars Magne Ingebrigtsen | 2013-12-20 05:29:08 +0100 |
| commit | cf91cee781fa7919d437faccf048e23d35af8ae8 (patch) | |
| tree | 44b190323679b501639d2816bb22269c2a198691 | |
| parent | 51d971b4292759075d304d3a92e9d8ad1f97ba9e (diff) | |
| download | emacs-cf91cee781fa7919d437faccf048e23d35af8ae8.tar.gz emacs-cf91cee781fa7919d437faccf048e23d35af8ae8.zip | |
* net/shr.el (shr-insert): Protect against infloops in degenerate tables.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/net/shr.el | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c3a0c2936db..464a3b11ce8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-12-20 Lars Magne Ingebrigtsen <larsi@gnus.org> | ||
| 2 | |||
| 3 | * net/shr.el (shr-insert): Protect against infloops in degenerate | ||
| 4 | tables. | ||
| 5 | |||
| 1 | 2013-12-20 RĂ¼diger Sonderfeld <ruediger@c-plusplus.de> | 6 | 2013-12-20 RĂ¼diger Sonderfeld <ruediger@c-plusplus.de> |
| 2 | 7 | ||
| 3 | * progmodes/octave.el (octave): Add link to manual and octave | 8 | * progmodes/octave.el (octave): Add link to manual and octave |
diff --git a/lisp/net/shr.el b/lisp/net/shr.el index 81a597c2703..4b67bafc5cd 100644 --- a/lisp/net/shr.el +++ b/lisp/net/shr.el | |||
| @@ -461,6 +461,7 @@ size, and full-buffer size." | |||
| 461 | (setq shr-state nil) | 461 | (setq shr-state nil) |
| 462 | (let (found) | 462 | (let (found) |
| 463 | (while (and (> (current-column) shr-width) | 463 | (while (and (> (current-column) shr-width) |
| 464 | (> shr-width 0) | ||
| 464 | (progn | 465 | (progn |
| 465 | (setq found (shr-find-fill-point)) | 466 | (setq found (shr-find-fill-point)) |
| 466 | (not (eolp)))) | 467 | (not (eolp)))) |