Skip to content

handle EOF condition in mp_fread, fix #163 #277

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 21, 2019
Merged

handle EOF condition in mp_fread, fix #163 #277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 14 additions & 11 deletions bn_mp_fread.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,27 @@ mp_err mp_fread(mp_int *a, int radix, FILE *stream)
{
mp_err err;
mp_sign neg;
int ch, y;
unsigned pos;

/* clear a */
mp_zero(a);

/* if first digit is - then set negative */
ch = fgetc(stream);
int ch = fgetc(stream);
if (ch == (int)'-') {
neg = MP_NEG;
ch = fgetc(stream);
} else {
neg = MP_ZPOS;
}

for (;;) {
pos = (unsigned)(ch - (int)'(');
/* no digits, return error */
if (ch == EOF) {
return MP_ERR;
}

/* clear a */
mp_zero(a);

do {
int y;
unsigned pos = (unsigned)(ch - (int)'(');
if (mp_s_rmap_reverse_sz < pos) {
break;
}
Expand All @@ -43,10 +47,9 @@ mp_err mp_fread(mp_int *a, int radix, FILE *stream)
if ((err = mp_add_d(a, (mp_digit)y, a)) != MP_OKAY) {
return err;
}
} while ((ch = fgetc(stream)) != EOF);

ch = fgetc(stream);
}
if (mp_cmp_d(a, 0uL) != MP_EQ) {
if (!mp_iszero(a)) {
a->sign = neg;
}

Expand Down
2 changes: 1 addition & 1 deletion tommath_class.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@
# define BN_MP_ZERO_C
# define BN_MP_MUL_D_C
# define BN_MP_ADD_D_C
# define BN_MP_CMP_D_C
# define BN_MP_ISZERO_C
#endif

#if defined(BN_MP_FWRITE_C)
Expand Down