mirrors
/
org-mode
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git
0
0
Fork 1
Code Releases Activity

Fix "Stack overflow in regexp matcher" in `org-refresh-stats-properties' 

* lisp/org.el (org-refresh-stats-properties): Simplify regexp.  Small
  refactoring.

Reported-by: Kevin Zettler <kevzettler@gmail.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/113555>
This commit is contained in:
Nicolas Goaziou 2017-05-20 09:09:03 +02:00
parent c848ade014
commit 85a26f0cfe
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
lisp/org.el
View File

@ -9825,22 +9825,19 @@ sub-tree if optional argument INHERIT is non-nil."
(defun org-refresh-stats-properties ()
"Refresh stats text properties in the buffer."
(let (stats)
(org-with-silent-modifications
(org-with-wide-buffer
(goto-char (point-min))
(while (re-search-forward
(concat org-outline-regexp-bol ".*"
"\\(?:\\[\\([0-9]+\\)%\\|\\([0-9]+\\)/\\([0-9]+\\)\\]\\)")
nil t)
(setq stats (cond ((equal (match-string 3) "0") 0)
((match-string 2)
(/ (* (string-to-number (match-string 2)) 100)
(string-to-number (match-string 3))))
(t (string-to-number (match-string 1)))))
(org-back-to-heading t)
(put-text-property (point) (progn (org-end-of-subtree t t) (point))
'org-stats stats))))))
(org-with-silent-modifications
(org-with-point-at 1
(let ((regexp (concat org-outline-regexp-bol
".*\\[\\([0-9]*\\)\\(?:%\\|/\\([0-9]*\\)\\)\\]")))
(while (re-search-forward regexp nil t)
(let* ((numerator (string-to-number (match-string 1)))
(denominator (and (match-end 2)
(string-to-number (match-string 2))))
(stats (cond ((not denominator) numerator) ;percent
((= denominator 0) 0)
(t (/ (* numerator 100) denominator)))))
(put-text-property (point) (progn (org-end-of-subtree t t) (point))
'org-stats stats)))))))
(defun org-refresh-effort-properties ()
"Refresh effort properties"