Skip to content

Enable more compiler warnings #94

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
ugexe merged 5 commits into from
Dec 30, 2021
Merged

Enable more compiler warnings #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b04e005
Try using clang
horgh Dec 21, 2021
d1d0d64
Fix -Wimplicit-int-conversion warning
horgh Dec 22, 2021
7435dbe
Fix -Wsign-conversion warnings
horgh Dec 22, 2021
cd07129
Fix -Wcast-qual warning
horgh Dec 22, 2021
9197405
Enable more compiler warnings
horgh Dec 22, 2021
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
4 changes: 3 additions & 1 deletion .github/workflows/address-sanitizer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ jobs:
name: Address Sanitizer
runs-on: ubuntu-latest
env:
CFLAGS: -fsanitize=address
ASAN_OPTIONS: strict_string_checks=1:detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1:detect_invalid_pointer_pairs=2
CC: clang
CFLAGS: -fsanitize=address -Wall -Wextra -Wpedantic -Wformat=2 -Walloca -Wvla -Wimplicit-fallthrough -Wcast-qual -Wconversion -Wshadow -Wundef -Wstrict-prototypes -Wswitch-enum -fstack-protector -D_FORTIFY_SOURCE=2 -Werror
LDFLAGS: -fsanitize=address
steps:
- name: Checkout
Expand Down
8 changes: 4 additions & 4 deletions extension/maxminddb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ static int Reader_init(PyObject *self, PyObject *args, PyObject *kwds) {
return -1;
}

uint16_t status = MMDB_open(filename, MMDB_MODE_MMAP, mmdb);
int const status = MMDB_open(filename, MMDB_MODE_MMAP, mmdb);
Py_XDECREF(filepath);

if (MMDB_SUCCESS != status) {
Expand Down Expand Up @@ -276,14 +276,14 @@ static int ip_converter(PyObject *obj, struct sockaddr_storage *ip_address) {
case 16: {
ip_address->ss_family = AF_INET6;
struct sockaddr_in6 *sin = (struct sockaddr_in6 *)ip_address;
memcpy(sin->sin6_addr.s6_addr, bytes, len);
memcpy(sin->sin6_addr.s6_addr, bytes, (size_t)len);
Py_DECREF(packed);
return 1;
}
case 4: {
ip_address->ss_family = AF_INET;
struct sockaddr_in *sin = (struct sockaddr_in *)ip_address;
memcpy(&(sin->sin_addr.s_addr), bytes, len);
memcpy(&(sin->sin_addr.s_addr), bytes, (size_t)len);
Py_DECREF(packed);
return 1;
}
Expand Down Expand Up @@ -526,7 +526,7 @@ static PyObject *from_map(MMDB_entry_data_list_s **entry_data_list) {
*entry_data_list = (*entry_data_list)->next;

PyObject *key = PyUnicode_FromStringAndSize(
(char *)(*entry_data_list)->entry_data.utf8_string,
(*entry_data_list)->entry_data.utf8_string,
(*entry_data_list)->entry_data.data_size);
if (!key) {
// PyUnicode_FromStringAndSize will set an appropriate exception
Expand Down