From 83ed722c8d9d4d9d4143062584b89f79f3b8104a Mon Sep 17 00:00:00 2001 From: Mattias Engdegård Date: Wed, 10 Jul 2019 19:24:58 +0200 Subject: Fix trig simplification crash (bug#33052) * 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. --- lisp/calc/calc-alg.el | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'lisp/calc/calc-alg.el') diff --git a/lisp/calc/calc-alg.el b/lisp/calc/calc-alg.el index 136b18e48f5..c3efeeeb62c 100644 --- a/lisp/calc/calc-alg.el +++ b/lisp/calc/calc-alg.el @@ -842,11 +842,13 @@ and should return the simplified expression to use (or nil)." (and (eq calc-angle-mode 'rad) (let ((n (math-linear-in (nth 1 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 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 expr)) 'calcFunc-arcsin) (math-div 1 @@ -867,11 +869,13 @@ and should return the simplified expression to use (or nil)." (and (eq calc-angle-mode 'rad) (let ((n (math-linear-in (nth 1 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 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 expr)) 'calcFunc-arcsin) (math-div 1 (nth 1 (nth 1 expr)))) (and (eq (car-safe (nth 1 expr)) 'calcFunc-arccos) @@ -972,11 +976,13 @@ and should return the simplified expression to use (or nil)." (and (eq calc-angle-mode 'rad) (let ((n (math-linear-in (nth 1 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 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 expr)) 'calcFunc-arcsin) (math-div (list 'calcFunc-sqrt (math-sub 1 (math-sqr (nth 1 (nth 1 expr))))) -- cgit v1.2.3