[Maxima-commits] CVS: maxima/src simp.lisp,1.9,1.10

[Raymond T. <rt...@us...>]

Update of /cvsroot/maxima/maxima/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23498/src

Modified Files:
	simp.lisp 
Log Message:
Bug 783051 expand should check expop and expon args/FIX

Suggested fix applied.


Index: simp.lisp
===================================================================
RCS file: /cvsroot/maxima/maxima/src/simp.lisp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- simp.lisp	9 Nov 2004 15:04:35 -0000	1.9
+++ simp.lisp	23 Nov 2004 18:37:40 -0000	1.10
@@ -2065,6 +2065,12 @@
 		   (mul2 prods (list '(mexpt simp) expnegsums -1))) t))))))
 
 (defmfun expand1 (exp $expop $expon)
+  (when (not (and (integerp $expop)
+		  (> $expop -1)))
+    (merror "Maxposex must be a non-negative-integer: ~%~M" $expop))
+  (when (not (and (integerp $expon)
+		  (> $expon -1)))
+    (merror "Maxnegex must be a non-negative-integer: ~%~M" $expon))
   (ssimplifya (specrepcheck exp)))
 
 ;; When the arg-count checking code is implemented ...