[Emacs-diffs] trunk r113228: Fix shr table rendering infloop

[Lars Ingebrigtsen]

------------------------------------------------------------
revno: 113228
revision-id: address@hidden
parent: address@hidden
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Sun 2013-06-30 15:11:41 +0200
message:
  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.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/net/shr.el                shr.el-20101002102929-yfzewk55rsg0mn93-1

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-06-30 05:08:23 +0000
+++ b/lisp/ChangeLog    2013-06-30 13:11:41 +0000
@@ -1,3 +1,10 @@
+2013-06-30  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * 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  <address@hidden>
 
        Some fixes and improvements for desktop frame restoration.

=== modified file 'lisp/net/shr.el'
--- a/lisp/net/shr.el   2013-06-28 07:57:49 +0000
+++ b/lisp/net/shr.el   2013-06-30 13:11:41 +0000
@@ -762,6 +762,7 @@
   "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 @@
              (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))