Fix shr table rendering infloop

* net/shr.el (shr-make-table-1): Add a sanity check that allows
progression on degenerate tables.
(shr-rescale-image): ImageMagick animated images currently doesn't
work.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4100efc4d6dc885dbed526b57ab008b77f84ade1..4aa4f37a323de80f795f409f8db8f1d4da0b6d98 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2013-06-30  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * net/shr.el (shr-make-table-1): Add a sanity check that allows
+       progression on degenerate tables.
+       (shr-rescale-image): ImageMagick animated images currently doesn't
+       work.
+
 2013-06-30  Juanma Barranquero  <lekktu@gmail.com>
 
        Some fixes and improvements for desktop frame restoration.

diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index 490bea40afd45e990dbbe9f21a4c5bc11dcfb30b..bdc30bc92920d9ebc69eae1a2d1dfd200af72db4 100644 (file)
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -762,6 +762,7 @@ If EXTERNAL, browse the URL using `shr-external-browser'."
   "Rescale DATA, if too big, to fit the current buffer.
 If FORCE, rescale the image anyway."
   (if (or (not (fboundp 'imagemagick-types))
+         (eq (image-type-from-data data) 'gif)
          (not (get-buffer-window (current-buffer))))
       (create-image data nil t :ascent 100)
     (let ((edges (window-inside-pixel-edges
@@ -1473,7 +1474,10 @@ ones, in case fg and bg are nil."
              (setq width
                    (if column
                        (aref widths width-column)
-                     0))
+                     10))
+             ;; Sanity check for degenerate tables.
+             (when (zerop width)
+               (setq width 10))
              (when (and fill
                         (setq colspan (cdr (assq :colspan (cdr column)))))
                (setq colspan (string-to-number colspan))