[bugfix] integer_cra: check if arguments contain at least 2 moduli

While at it, also fix exam_cra so it does not produce pointless inputs.

diff --git a/check/exam_cra.cpp b/check/exam_cra.cpp
index 2c6163eef65c9e410e13bc8fa776bf4d0d96d3c5..6e247704fac4e9a82ed6d9e2716771e8c0de63dd 100644 (file)
--- a/check/exam_cra.cpp
+++ b/check/exam_cra.cpp
@@ -102,12 +102,14 @@ make_random_moduli(const cln::cl_I& limit)
        std::vector<cln::cl_I> moduli;
        cln::cl_I prod(1);
        cln::cl_I next = random_I(std::min(limit >> 1, cln::cl_I(128)));
        std::vector<cln::cl_I> moduli;
        cln::cl_I prod(1);
        cln::cl_I next = random_I(std::min(limit >> 1, cln::cl_I(128)));

+       unsigned count = 0;

        do {
                cln::cl_I tmp = nextprobprime(next);
                next = tmp + random_I(cln::cl_I(10)) + 1;
                prod = prod*tmp;
                moduli.push_back(tmp);
        do {
                cln::cl_I tmp = nextprobprime(next);
                next = tmp + random_I(cln::cl_I(10)) + 1;
                prod = prod*tmp;
                moduli.push_back(tmp);

-       } while (prod < limit);
+               ++count;
+       } while (prod < limit || (count < 2));

        return moduli;
 }
 
        return moduli;
 }
 

diff --git a/ginac/polynomial/cra_garner.cpp b/ginac/polynomial/cra_garner.cpp
index b400adbe69fca8d9c278e3f370197faf112aa2e6..76d1e075c1d1a5e63395f8ea6be786433c2422e2 100644 (file)
--- a/ginac/polynomial/cra_garner.cpp
+++ b/ginac/polynomial/cra_garner.cpp
@@ -3,6 +3,7 @@
 #include <vector>
 #include <cstddef>
 #include "cra_garner.hpp"
 #include <vector>
 #include <cstddef>
 #include "cra_garner.hpp"

+#include "compiler.h"

 
 namespace cln
 {
 
 namespace cln
 {


@@ -73,6 +74,8 @@ mixed_radix_2_ordinary(const vector<cl_I>& mixed_radix_coeffs,
 cl_I integer_cra(const vector<cl_I>& residues,
                 const vector<cl_I>& moduli)
 {
 cl_I integer_cra(const vector<cl_I>& residues,
                 const vector<cl_I>& moduli)
 {

+       if (unlikely(moduli.size() < 2))
+               throw std::invalid_argument("integer_cra: need at least 2 moduli");

 
        vector<cl_MI> recips(moduli.size() - 1);
        compute_recips(recips, moduli);
 
        vector<cl_MI> recips(moduli.size() - 1);
        compute_recips(recips, moduli);