From 7986816cff5f41d5359370a3031f64695ecbc9b8 Mon Sep 17 00:00:00 2001 From: Robotic-Brain Date: Fri, 17 Jan 2025 09:29:48 +0100 Subject: [PATCH] [#493] Fix unchecked calloc bug in network.c (#493) At line 636 sport will always be non-NULL because it has already been checked in line 608 using early return on error. Meanwhile result has never been checked against NULL and is subsequently used in line 696. Probable cause of the bug is inadequate copy-and-pasting of code. Close #493 --- AUTHORS | 1 + doc/manual/97-acknowledgement.md | 1 + doc/manual/advanced/97-acknowledgement.md | 1 + src/libpgagroal/network.c | 2 +- 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/AUTHORS b/AUTHORS index ede2d072..037b861f 100644 --- a/AUTHORS +++ b/AUTHORS @@ -14,3 +14,4 @@ Yihe Lu Eugenio Gigante Haoran Zhang Mohanad Khaled +Christian Englert diff --git a/doc/manual/97-acknowledgement.md b/doc/manual/97-acknowledgement.md index c364b48f..2f744178 100644 --- a/doc/manual/97-acknowledgement.md +++ b/doc/manual/97-acknowledgement.md @@ -21,6 +21,7 @@ Yihe Lu Eugenio Gigante Mohanad Khaled Haoran Zhang +Christian Englert ``` ## Committers diff --git a/doc/manual/advanced/97-acknowledgement.md b/doc/manual/advanced/97-acknowledgement.md index c364b48f..2f744178 100644 --- a/doc/manual/advanced/97-acknowledgement.md +++ b/doc/manual/advanced/97-acknowledgement.md @@ -21,6 +21,7 @@ Yihe Lu Eugenio Gigante Mohanad Khaled Haoran Zhang +Christian Englert ``` ## Committers diff --git a/src/libpgagroal/network.c b/src/libpgagroal/network.c index 340f11c0..dcedced3 100644 --- a/src/libpgagroal/network.c +++ b/src/libpgagroal/network.c @@ -633,7 +633,7 @@ bind_host(const char* hostname, int port, int** fds, int* length, bool non_block } result = calloc(1, size * sizeof(int)); - if (sport == NULL) + if (result == NULL) { pgagroal_log_fatal("Couldn't allocate memory while binding host"); return 1;