mirror/tesseract
1
0
Fork 0
mirror of https://github.com/tesseract-ocr/tesseract.git synced 2024-11-27 12:49:35 +08:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Fix wrong results from function streamtofloat

Browse Source 
The local variable k should be 10 ^ (number of digits after comma),
but will overflow when there are more than 9 digits after the comma
because an int value cannot store 10000000000.

This results in wrong double values read from .tr files for example
(or in a runtime exception if Tesseract was compiled with -ftrapv).

Using uint64_t does not fix the general problem but allows more digits
which should be sufficient for the data read by Tesseract.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
This commit is contained in:
Stefan Weil 2018-11-17 19:57:58 +01:00
parent 7e5f0d6fc6
commit 26620a7b50
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ccutil/scanutils.cpp
View File

@ -144,11 +144,11 @@ uintmax_t streamtoumax(FILE* s, int base) {
}
double streamtofloat(FILE* s) {
int minus = 0;
int v = 0;
int d, c = 0;
int k = 1;
int w = 0;
bool minus = false;
uint64_t v = 0;
int d, c;
uint64_t k = 1;
uint64_t w = 0;
for (c = fgetc(s);
isspace(static_cast<unsigned char>(c)) && (c != EOF);
@ -169,8 +169,7 @@ double streamtofloat(FILE* s) {
k *= 10;
}
}
double f = static_cast<double>(v)
+ static_cast<double>(w) / static_cast<double>(k);
double f = v + static_cast<double>(w) / k;
if (c == 'e' || c == 'E') {
c = fgetc(s);
int expsign = 1;