tommy/libpostal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #229 from openvenues/32bit_numex_fix

Browse Source 
32-bit safety in numex table loading
This commit is contained in:
Al Barrentine
2017-07-20 18:11:02 -04:00
committed by GitHub
parent 0cb8c61fb0 97044f5a8b
commit dab3b95ae1
1 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/numex.c
View File

@@ -227,33 +227,47 @@ static bool numex_language_write(numex_language_t *language, FILE *f) {
} }
static bool numex_rule_read(FILE *f, numex_rule_t *rule) { static bool numex_rule_read(FILE *f, numex_rule_t *rule) {
if (!file_read_uint64(f, (uint64_t *)&rule->left_context_type)) { uint64_t left_context_type;
if (!file_read_uint64(f, &left_context_type)) {
return false; return false;
} }
rule->left_context_type = left_context_type;
if (!file_read_uint64(f, (uint64_t *)&rule->right_context_type)) { uint64_t right_context_type;
if (!file_read_uint64(f, &right_context_type)) {
return false; return false;
} }
rule->right_context_type = right_context_type;
if (!file_read_uint64(f, (uint64_t *)&rule->rule_type)) { uint64_t rule_type;
if (!file_read_uint64(f, &rule_type)) {
return false; return false;
} }
rule->rule_type = rule_type;
if (!file_read_uint64(f, (uint64_t *)&rule->gender)) { uint64_t gender;
if (!file_read_uint64(f, &gender)) {
return false; return false;
} }
rule->gender = gender;
if (!file_read_uint64(f, (uint64_t *)&rule->category)) { uint64_t category;
if (!file_read_uint64(f, &category)) {
return false; return false;
} }
rule->category = category;
if (!file_read_uint32(f, &rule->radix)) { uint32_t radix;
if (!file_read_uint32(f, &radix)) {
return false; return false;
} }
rule->radix = radix;
if (!file_read_uint64(f, (uint64_t *)&rule->value)) { uint64_t value;
if (!file_read_uint64(f, &value)) {
return false; return false;
} }
rule->value = value;
return true; return true;
} }
@@ -343,15 +357,17 @@ static ordinal_indicator_t *ordinal_indicator_read(FILE *f) {
return NULL; return NULL;
} }
gender_t gender; uint64_t gender_uint64;
if (!file_read_uint64(f, (uint64_t *)&gender)) { if (!file_read_uint64(f, &gender_uint64)) {
return NULL; return NULL;
} }
gender_t gender = gender_uint64;
grammatical_category_t category; uint64_t category_uint64;
if (!file_read_uint64(f, (uint64_t *)&category)) { if (!file_read_uint64(f, &category_uint64)) {
return NULL; return NULL;
} }
grammatical_category_t category = category_uint64;
uint64_t ordinal_suffix_len; uint64_t ordinal_suffix_len;
if (!file_read_uint64(f, &ordinal_suffix_len)) { if (!file_read_uint64(f, &ordinal_suffix_len)) {