diff options
author | Pascal Quantin <pascal.quantin@gmail.com> | 2018-03-07 22:10:31 +0100 |
---|---|---|
committer | Pascal Quantin <pascal.quantin@gmail.com> | 2018-03-09 11:20:41 +0000 |
commit | 4e6d989df43af78439fccd24a176a14c534aea99 (patch) | |
tree | fe3e181869ec7deacc248bf1ae0f4c824761eddd /epan | |
parent | 572f78a8610282151e7d165b11e0bf5092efbb5a (diff) |
Add MaxMindDB 1.3.2 library to Windows
Change-Id: I328b6a05cc356be59ac63e80eae55a832bf76a47
Reviewed-on: https://code.wireshark.org/review/26347
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'epan')
-rw-r--r-- | epan/maxmind_db.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/maxmind_db.c b/epan/maxmind_db.c index 78973555fc..ece13f819d 100644 --- a/epan/maxmind_db.c +++ b/epan/maxmind_db.c @@ -117,7 +117,7 @@ static const void *chunkify_v6_addr(const ws_in6_addr *addr) { void *chunk_v6_bytes = (char *) wmem_map_lookup(mmdb_ipv6_map, addr->bytes); if (!chunk_v6_bytes) { - chunk_v6_bytes = wmem_memdup(wmem_epan_scope(), addr->bytes, sizeof(struct in6_addr)); + chunk_v6_bytes = wmem_memdup(wmem_epan_scope(), addr->bytes, sizeof(ws_in6_addr)); wmem_map_insert(mmdb_ipv6_map, chunk_v6_bytes, chunk_v6_bytes); } @@ -135,7 +135,7 @@ process_mmdbr_stdout(int fd) { while (ws_pipe_data_available(fd)) { read_buf[0] = '\0'; - ssize_t read_status = ws_read(fd, read_buf, read_buf_size); + ssize_t read_status = ws_read(fd, read_buf, (unsigned int)read_buf_size); if (read_status < 1) { MMDB_DEBUG("read error %s", g_strerror(errno)); mmdb_resolve_stop(); |