Protect against invalid column-spans.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index da02588..2b0ab1b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2013-06-19  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * shr.el (shr-make-table-1): Protect against invalid column-spans.
+
 2013-06-19  Tom Tromey  <tromey@redhat.com>
 
        * net/eww.el (eww-top-url): Remove.

diff --git a/lisp/shr.el b/lisp/shr.el
index acda83f..868956d 100644 (file)
--- a/lisp/shr.el
+++ b/lisp/shr.el
@@ -1463,6 +1463,9 @@ ones, in case fg and bg are nil."
                (aset rowspans i (+ (aref rowspans i)
                                    (1- (string-to-number
                                         (cdr (assq :rowspan (cdr column))))))))
+             ;; Sanity check for invalid column-spans.
+             (when (>= width-column (length widths))
+               (setq width-column 0))
              (setq width
                    (if column
                        (aref widths width-column)