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

[fix] All file_read_uint64 calls that use stack variables read into a uint64_t not a size_t so as not to smash the stack under a 32-bit arch (issue #18)

Browse Source
This commit is contained in:
Al
2016-02-29 22:36:00 -05:00
parent 3aba78d806
commit d35f97f6f1
8 changed files with 162 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/geodb.c
View File

@@ -80,23 +80,23 @@ geodb_t *geodb_init(char *dir) {
FILE *f = fopen(postal_codes_path, "rb");
uint64_t num_postal_strings = 0;
if (!file_read_uint64(f, (uint64_t *)&num_postal_strings)) {
if (!file_read_uint64(f, &num_postal_strings)) {
goto exit_geodb_created;
}
size_t postal_codes_str_len;
uint64_t postal_codes_str_len;
if (!file_read_uint64(f, (uint64_t *)&postal_codes_str_len)) {
if (!file_read_uint64(f, &postal_codes_str_len)) {
goto exit_geodb_created;
}
char_array *array = char_array_new_size(postal_codes_str_len);
char_array *array = char_array_new_size((size_t)postal_codes_str_len);
if (!file_read_chars(f, array->a, postal_codes_str_len)) {
if (!file_read_chars(f, array->a, (size_t)postal_codes_str_len)) {
goto exit_geodb_created;
}
array->n = postal_codes_str_len;
array->n = (size_t)postal_codes_str_len;
gdb->postal_codes = cstring_array_from_char_array(array);