Fixed off-by-one

Author: czurnieden

mp_read_radix.c

@@ -37,11 +37,11 @@ mp_err mp_read_radix(mp_int *a, const char *str, int radix)
 
    /* Try faster version first */
    if (MP_HAS(S_MP_FASTER_READ_RADIX)) {
-      if ((err = s_mp_faster_read_radix(a, str, 0, (int)s_mp_strlen(str),
-                                        radix)) != MP_OKAY)                                       goto LTM_ERR;
+      if ((err = s_mp_faster_read_radix(a, str, 0, (int)s_mp_strlen(str) - 1,
+                                        radix)) != MP_OKAY)                                              goto LTM_ERR;
    } else if (MP_HAS(S_MP_SLOWER_READ_RADIX)) {
-      if ((err = s_mp_slower_read_radix(a, str, 0, (int)s_mp_strlen(str),
-                                        radix)) != MP_OKAY)                                       goto LTM_ERR;
+      if ((err = s_mp_slower_read_radix(a, str, 0, (int)s_mp_strlen(str) - 1,
+                                        radix)) != MP_OKAY)                                              goto LTM_ERR;
    }
 
    /* set the sign only if a != 0 */

s_mp_faster_read_radix.c

@@ -21,14 +21,13 @@ static const uint8_t s_read_radix_cutoff[65] = { 0, 0,
 /* This is in mp_prime_is_prime.c and can be reused */
 static int s_floor_ilog2(int value)
 {
-   unsigned int r = 0;
+   int r = 0;
    while ((value >>= 1) != 0) {
       r++;
    }
    return r;
 }
 
-
 mp_err s_mp_faster_read_radix(mp_int *a, const char *str, int start, int end, int radix)
 {
    int len, mid;
@@ -52,7 +51,7 @@ mp_err s_mp_faster_read_radix(mp_int *a, const char *str, int start, int end, in
    }
 
    if ((err = s_mp_slower_read_radix(&A, str, start, start + mid + 1, radix)) != MP_OKAY)                goto LTM_ERR;
-   if ((err = s_mp_slower_read_radix(&B, str, start + mid + 1, end, radix)) != MP_OKAY)                  goto LTM_ERR;
+   if ((err = s_mp_slower_read_radix(&B, str, start + mid +1, end, radix)) != MP_OKAY)                  goto LTM_ERR;
 
    if (MP_IS_2EXPT((unsigned int)radix)) {
       if ((err = mp_mul_2d(&A, ((len - mid) -1) * s_floor_ilog2(radix), &A)) != MP_OKAY)                 goto LTM_ERR;

s_mp_slower_read_radix.c

@@ -11,22 +11,26 @@ mp_err s_mp_slower_read_radix(mp_int *a, const char *str, int start, int end, in
    /* checks are done by caller */
 
    char *_s = (char *)(str + start);
-   for (i = start; i < end; i++) {
+   for (i = start; (i < end) && (*_s != '\0'); i++) {
       uint8_t y;
 
       char ch = (radix <= 36) ? (char)MP_TOUPPER((int)*_s) : *_s;
       unsigned int pos = (unsigned int)(ch - '+');
       if (MP_RADIX_MAP_REVERSE_SIZE <= pos) {
-         err = MP_VAL;
-         goto LBL_ERR;
+         if ((*_s != '\0') && (*_s != '\r') && (*_s != '\n')) {
+            return MP_VAL;
+         }
+         break;
       }
       y = s_mp_radix_map_reverse[pos];
       if (y >= radix) {
-         err = MP_VAL;
-         goto LBL_ERR;
+         if ((*_s != '\0') && (*_s != '\r') && (*_s != '\n')) {
+            return MP_VAL;
+         }
+         break;
       }
-      if ((err = mp_mul_d(a, (mp_digit)radix, a)) != MP_OKAY)                                       goto LBL_ERR;
-      if ((err = mp_add_d(a, (mp_digit)y, a)) != MP_OKAY)                                           goto LBL_ERR;
+      if ((err = mp_mul_d(a, (mp_digit)radix, a)) != MP_OKAY)                                            goto LBL_ERR;
+      if ((err = mp_add_d(a, (mp_digit)y, a)) != MP_OKAY)                                                goto LBL_ERR;
       _s++;
    }
 

tommath_class.h

@@ -1069,6 +1069,7 @@
 #   define MP_DIV_2D_C
 #   define MP_DIV_C
 #   define MP_EXPT_N_C
+#   define MP_GET_I32_C
 #   define MP_INIT_C
 #   define MP_INIT_I32_C
 #   define MP_INIT_MULTI_C