mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-16 16:20:40 -08:00
Code Issues Projects Releases Wiki Activity

Fix trig simplification crash (bug#33052)

Browse source 
* lisp/calc/calc-alg.el (calcFunc-sec, calcFunc-csc, calcFunc-cot):
Check that `math-known-sin' and `math-known-tan' succeeded before
using their value in arithmetic.
* test/lisp/calc/calc-tests.el (calc-test-trig): Add regression tests.
Backport from master.
This commit is contained in:
Mattias Engdegård 2019-07-10 19:24:58 +02:00
parent 73e1727c40
commit bd0f173199
2 changed files with 42 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

18
lisp/calc/calc-alg.el
View file

@ -847,11 +847,13 @@
(and (eq calc-angle-mode 'rad)
(let ((n (math-linear-in (nth 1 math-simplify-expr) '(var pi var-pi))))
(and n
(math-div 1 (math-known-sin (car n) (nth 1 n) 120 300)))))
(let ((s (math-known-sin (car n) (nth 1 n) 120 300)))
(and s (math-div 1 s))))))
(and (eq calc-angle-mode 'deg)
(let ((n (math-integer-plus (nth 1 math-simplify-expr))))
(and n
(math-div 1 (math-known-sin (car n) (nth 1 n) '(frac 2 3) 300)))))
(let ((s (math-known-sin (car n) (nth 1 n) '(frac 2 3) 300)))
(and s (math-div 1 s))))))
(and (eq (car-safe (nth 1 math-simplify-expr)) 'calcFunc-arcsin)
(math-div
1
@ -872,11 +874,13 @@
(and (eq calc-angle-mode 'rad)
(let ((n (math-linear-in (nth 1 math-simplify-expr) '(var pi var-pi))))
(and n
(math-div 1 (math-known-sin (car n) (nth 1 n) 120 0)))))
(let ((s (math-known-sin (car n) (nth 1 n) 120 0)))
(and s (math-div 1 s))))))
(and (eq calc-angle-mode 'deg)
(let ((n (math-integer-plus (nth 1 math-simplify-expr))))
(and n
(math-div 1 (math-known-sin (car n) (nth 1 n) '(frac 2 3) 0)))))
(let ((s (math-known-sin (car n) (nth 1 n) '(frac 2 3) 0)))
(and s (math-div 1 s))))))
(and (eq (car-safe (nth 1 math-simplify-expr)) 'calcFunc-arcsin)
(math-div 1 (nth 1 (nth 1 math-simplify-expr))))
(and (eq (car-safe (nth 1 math-simplify-expr)) 'calcFunc-arccos)
@ -977,11 +981,13 @@
(and (eq calc-angle-mode 'rad)
(let ((n (math-linear-in (nth 1 math-simplify-expr) '(var pi var-pi))))
(and n
(math-div 1 (math-known-tan (car n) (nth 1 n) 120)))))
(let ((tn (math-known-tan (car n) (nth 1 n) 120)))
(and tn (math-div 1 tn))))))
(and (eq calc-angle-mode 'deg)
(let ((n (math-integer-plus (nth 1 math-simplify-expr))))
(and n
(math-div 1 (math-known-tan (car n) (nth 1 n) '(frac 2 3))))))
(let ((tn (math-known-tan (car n) (nth 1 n) '(frac 2 3))))
(and tn (math-div 1 tn))))))
(and (eq (car-safe (nth 1 math-simplify-expr)) 'calcFunc-arcsin)
(math-div (list 'calcFunc-sqrt
(math-sub 1 (math-sqr (nth 1 (nth 1 math-simplify-expr)))))

30
test/lisp/calc/calc-tests.el
View file

@ -138,6 +138,36 @@ An existing calc stack is reused, otherwise a new one is created."
(nth 1 (calcFunc-cos 1)))
0 4))))))
(ert-deftest calc-test-trig ()
"Trigonometric simplification; bug#33052."
(let ((calc-angle-mode 'rad))
(let ((calc-symbolic-mode t))
(should (equal (math-simplify '(calcFunc-sin (/ (var pi var-pi) 4)))
'(/ (calcFunc-sqrt 2) 2)))
(should (equal (math-simplify '(calcFunc-cos (/ (var pi var-pi) 4)))
'(/ (calcFunc-sqrt 2) 2)))
(should (equal (math-simplify '(calcFunc-sec (/ (var pi var-pi) 4)))
'(calcFunc-sqrt 2)))
(should (equal (math-simplify '(calcFunc-csc (/ (var pi var-pi) 4)))
'(calcFunc-sqrt 2)))
(should (equal (math-simplify '(calcFunc-tan (/ (var pi var-pi) 3)))
'(calcFunc-sqrt 3)))
(should (equal (math-simplify '(calcFunc-cot (/ (var pi var-pi) 3)))
'(/ (calcFunc-sqrt 3) 3))))
(let ((calc-symbolic-mode nil))
(should (equal (math-simplify '(calcFunc-sin (/ (var pi var-pi) 4)))
'(calcFunc-sin (/ (var pi var-pi) 4))))
(should (equal (math-simplify '(calcFunc-cos (/ (var pi var-pi) 4)))
'(calcFunc-cos (/ (var pi var-pi) 4))))
(should (equal (math-simplify '(calcFunc-sec (/ (var pi var-pi) 4)))
'(calcFunc-sec (/ (var pi var-pi) 4))))
(should (equal (math-simplify '(calcFunc-csc (/ (var pi var-pi) 4)))
'(calcFunc-csc (/ (var pi var-pi) 4))))
(should (equal (math-simplify '(calcFunc-tan (/ (var pi var-pi) 3)))
'(calcFunc-tan (/ (var pi var-pi) 3))))
(should (equal (math-simplify '(calcFunc-cot (/ (var pi var-pi) 3)))
'(calcFunc-cot (/ (var pi var-pi) 3)))))))
(ert-deftest calc-test-solve-linear-system ()
"Test linear system solving (bug#35374)."
;; x + y = 3