fixed potential crash in power:(l)degree() when used with non-integer

exponents

diff --git a/ginac/power.cpp b/ginac/power.cpp
index f292ff8b0daecc4f4d50d710d2358128eb8f2551..c1568145d706157e250375ff8189f5caee944872 100644 (file)
--- a/ginac/power.cpp
+++ b/ginac/power.cpp
@@ -240,13 +240,10 @@ ex power::map(map_function & f) const
 
 int power::degree(const ex & s) const
 {
-       if (is_exactly_of_type(*exponent.bp,numeric)) {
-               if (basis.is_equal(s)) {
-                       if (ex_to<numeric>(exponent).is_integer())
-                               return ex_to<numeric>(exponent).to_int();
-                       else
-                               return 0;
-               } else
+       if (is_exactly_of_type(*exponent.bp, numeric) && ex_to<numeric>(exponent).is_integer()) {
+               if (basis.is_equal(s))
+                       return ex_to<numeric>(exponent).to_int();
+               else
                        return basis.degree(s) * ex_to<numeric>(exponent).to_int();
        }
        return 0;
@@ -254,13 +251,10 @@ int power::degree(const ex & s) const
 
 int power::ldegree(const ex & s) const 
 {
-       if (is_exactly_of_type(*exponent.bp,numeric)) {
-               if (basis.is_equal(s)) {
-                       if (ex_to<numeric>(exponent).is_integer())
-                               return ex_to<numeric>(exponent).to_int();
-                       else
-                               return 0;
-               } else
+       if (is_exactly_of_type(*exponent.bp, numeric) && ex_to<numeric>(exponent).is_integer()) {
+               if (basis.is_equal(s))
+                       return ex_to<numeric>(exponent).to_int();
+               else
                        return basis.ldegree(s) * ex_to<numeric>(exponent).to_int();
        }
        return 0;