CHG: updated Reveng version from 1.4.0 -> 1.4.4 .

[proxmark3-svn] / client / reveng / reveng.c

diff --git a/client/reveng/reveng.c b/client/reveng/reveng.c
index dd50987c308fd7b47c2ccc503e99289b8897880c..8a669e9058fcce217856024705de7387adf90add 100644 (file)
--- a/client/reveng/reveng.c
+++ b/client/reveng/reveng.c
@@ -1,9 +1,9 @@
 /* reveng.c
 /* reveng.c

- * Greg Cook, 9/Apr/2015
+ * Greg Cook, 27/Jun/2016

  */
 
  */
 

-/* CRC RevEng, an arbitrary-precision CRC calculator and algorithm finder
- * Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015  Gregory Cook
+/* CRC RevEng: arbitrary-precision CRC calculator and algorithm finder
+ * Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015, 2016  Gregory Cook

  *
  * This file is part of CRC RevEng.
  *
  *
  * This file is part of CRC RevEng.
  *


@@ -18,7 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License

- * along with CRC RevEng.  If not, see <http://www.gnu.org/licenses/>.
+ * along with CRC RevEng.  If not, see <https://www.gnu.org/licenses/>.

  */
 
 /* 2013-09-16: calini(), calout() work on shortest argument
  */
 
 /* 2013-09-16: calini(), calout() work on shortest argument


@@ -141,8 +141,10 @@ reveng(const model_t *guess, const poly_t qpoly, int rflags, int args, const pol
                engini(&resc, &result, guess->spoly, guess->flags, args, argpolys);
 
 requit:
                engini(&resc, &result, guess->spoly, guess->flags, args, argpolys);
 
 requit:

-       if(!(result = realloc(result, ++resc * sizeof(model_t))))
+       if(!(result = realloc(result, ++resc * sizeof(model_t)))) {

                uerror("cannot reallocate result array");
                uerror("cannot reallocate result array");

+               return NULL;
+       }

        rptr = result + resc - 1;
        rptr->spoly  = pzero;
        rptr->init   = pzero;
        rptr = result + resc - 1;
        rptr->spoly  = pzero;
        rptr->init   = pzero;


@@ -471,9 +473,12 @@ chkres(int *resc, model_t **result, const poly_t divisor, const poly_t init, int
        pfree(&xor);
        if(aptr != eptr) return;
 
        pfree(&xor);
        if(aptr != eptr) return;
 

-       if(!(*result = realloc(*result, ++*resc * sizeof(model_t))))
+       *result = realloc(*result, ++*resc * sizeof(model_t));
+       if (!*result) {

                uerror("cannot reallocate result array");
                uerror("cannot reallocate result array");

-
+               return;
+       }
+       

        rptr = *result + *resc - 1;
        rptr->spoly  = pclone(divisor);
        rptr->init   = pclone(init);
        rptr = *result + *resc - 1;
        rptr->spoly  = pclone(divisor);
        rptr->init   = pclone(init);