diff --git a/common.c b/common.c
index 997507c..a7a47ee 100644
--- a/common.c
+++ b/common.c
@@ -84,6 +84,7 @@ int get_fd_sockets(int *sockfd[])
if (sd > 0) {
int i;
*sockfd = malloc(sd * sizeof(*sockfd[0]));
+ CHECK_ALLOC(*sockfd, "malloc");
for (i = 0; i < sd; i++) {
(*sockfd)[i] = SD_LISTEN_FDS_START + i;
}
@@ -125,6 +126,7 @@ int start_listen_sockets(int *sockfd[], struct addrinfo *addr_list)
fprintf(stderr, "listening to %d addresses\n", num_addr);
*sockfd = malloc(num_addr * sizeof(*sockfd[0]));
+ CHECK_ALLOC(*sockfd, "malloc");
for (i = 0, addr = addr_list; i < num_addr && addr; i++, addr = addr->ai_next) {
if (!addr) {
@@ -314,10 +316,7 @@ int defer_write(struct queue *q, void* data, int data_size)
fprintf(stderr, "**** writing deferred on fd %d\n", q->fd);
p = realloc(q->begin_deferred_data, data_offset + q->deferred_data_size + data_size);
- if (!p) {
- perror("realloc");
- exit(1);
- }
+ CHECK_ALLOC(p, "realloc");
q->begin_deferred_data = p;
q->deferred_data = p + data_offset;
diff --git a/common.h b/common.h
index 9da9c6b..e8fad3e 100644
--- a/common.h
+++ b/common.h
@@ -48,6 +48,13 @@
return res; \
}
+#define CHECK_ALLOC(a, str) \
+ if (!a) { \
+ fprintf(stderr, "%s:%d:", __FILE__, __LINE__); \
+ perror(str); \
+ exit(1); \
+ }
+
#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
#if 1
diff --git a/sslh-fork.c b/sslh-fork.c
index 2c0b595..78bf460 100644
--- a/sslh-fork.c
+++ b/sslh-fork.c
@@ -145,6 +145,7 @@ void main_loop(int listen_sockets[], int num_addr_listen)
listener_pid_number = num_addr_listen;
listener_pid = malloc(listener_pid_number * sizeof(listener_pid[0]));
+ CHECK_ALLOC(listener_pid, "malloc");
/* Start one process for each listening address */
for (i = 0; i < num_addr_listen; i++) {
diff --git a/sslh-main.c b/sslh-main.c
index f0ec9dd..2dbbbd6 100644
--- a/sslh-main.c
+++ b/sslh-main.c
@@ -210,14 +210,17 @@ static void setup_regex_probe(struct proto *p, config_setting_t* probes)
p->probe = get_probe("regex");
probe_list = calloc(num_probes + 1, sizeof(*probe_list));
+ CHECK_ALLOC(probe_list, "calloc");
p->data = (void*)probe_list;
for (i = 0; i < num_probes; i++) {
probe_list[i] = malloc(sizeof(*(probe_list[i])));
+ CHECK_ALLOC(probe_list[i], "malloc");
expr = config_setting_get_string_elem(probes, i);
res = regcomp(probe_list[i], expr, REG_EXTENDED);
if (res) {
err = malloc(errsize = regerror(res, probe_list[i], NULL, 0));
+ CHECK_ALLOC(err, "malloc");
regerror(res, probe_list[i], err, errsize);
fprintf(stderr, "%s:%s\n", expr, err);
free(err);
@@ -257,10 +260,12 @@ static void setup_sni_alpn_list(struct proto *p, config_setting_t* config_items,
}
sni_hostname_list = calloc(num_probes + 1, ++max_server_name_len);
+ CHECK_ALLOC(sni_hostname_list, "calloc");
for (i = 0; i < num_probes; i++) {
config_item = config_setting_get_string_elem(config_items, i);
sni_hostname_list[i] = malloc(max_server_name_len);
+ CHECK_ALLOC(sni_hostname_list[i], "malloc");
strcpy (sni_hostname_list[i], config_item);
if(verbose) fprintf(stderr, "%s: %s[%d]: %s\n", p->description, name, i, sni_hostname_list[i]);
}
@@ -303,6 +308,7 @@ static int config_protocols(config_t *config, struct proto **prots)
num_prots = config_setting_length(setting);
for (i = 0; i < num_prots; i++) {
p = calloc(1, sizeof(*p));
+ CHECK_ALLOC(p, "calloc");
if (i == 0) *prots = p;
if (prev) prev->next = p;
prev = p;
@@ -443,6 +449,7 @@ static void make_alloptions(void)
/* Create all_options, composed of const_options followed by one option per
* known protocol */
all_options = calloc(ARRAY_SIZE(const_options) + get_num_builtins(), sizeof(struct option));
+ CHECK_ALLOC(all_options, "calloc");
memcpy(all_options, const_options, sizeof(const_options));
append_protocols(all_options, ARRAY_SIZE(const_options) - 1, builtins, get_num_builtins());
}
@@ -521,8 +528,10 @@ next_arg:
if (!prots) {
/* No protocols yet -- create the list */
p = prots = calloc(1, sizeof(*p));
+ CHECK_ALLOC(p, "calloc");
} else {
p->next = calloc(1, sizeof(*p));
+ CHECK_ALLOC(p->next, "calloc");
p = p->next;
}
memcpy(p, &builtins[c-PROT_SHIFT], sizeof(*p));
diff --git a/sslh-select.c b/sslh-select.c
index 07265e3..ebc2cc8 100644
--- a/sslh-select.c
+++ b/sslh-select.c
@@ -322,6 +322,7 @@ void main_loop(int listen_sockets[], int num_addr_listen)
num_cnx = cnx_num_alloc; /* Start with a set pool of slots */
cnx = malloc(num_cnx * sizeof(struct connection));
+ CHECK_ALLOC(cnx, "malloc");
for (i = 0; i < num_cnx; i++)
init_cnx(&cnx[i]);
diff --git a/systemd-sslh-generator.c b/systemd-sslh-generator.c
index 9f57c05..01aef63 100644
--- a/systemd-sslh-generator.c
+++ b/systemd-sslh-generator.c
@@ -7,7 +7,8 @@
static char* resolve_listen(const char *hostname, const char *port) {
/* Need room in the strcat for \0 and :
* the format in the socket unit file is hostname:port */
- char *conn = (char*)malloc(strlen(hostname)+strlen(port)+2);
+ char *conn = malloc(strlen(hostname)+strlen(port)+2);
+ CHECK_ALLOC(conn, "malloc");
strcpy(conn, hostname);
strcat(conn, ":");
strcat(conn, port);
@@ -41,6 +42,7 @@ static int get_listen_from_conf(const char *filename, char **listen[]) {
int i;
len = config_setting_length(setting);
*listen = malloc(len * sizeof(**listen));
+ CHECK_ALLOC(*listen, "malloc");
for (i = 0; i < len; i++) {
addr = config_setting_get_elem(setting, i);
if (! (config_setting_lookup_string(addr, "host", &hostname) &&
@@ -51,6 +53,7 @@ static int get_listen_from_conf(const char *filename, char **listen[]) {
return -1;
} else {
(*listen)[i] = malloc(strlen(resolve_listen(hostname, port)));
+ CHECK_ALLOC((*listen)[i], "malloc");
strcpy((*listen)[i], resolve_listen(hostname, port));
}
}
@@ -115,6 +118,7 @@ static int gen_sslh_config(char *runtime_unit_dir) {
size_t uf_len = strlen(unit_file);
size_t runtime_len = strlen(runtime_unit_dir) + uf_len + 1;
char *runtime_conf = malloc(runtime_len);
+ CHECK_ALLOC(runtime_conf, "malloc");
strcpy(runtime_conf, runtime_unit_dir);
strcat(runtime_conf, unit_file);
runtime_conf_fd = fopen(runtime_conf, "w");
diff --git a/tls.c b/tls.c
index 4144f72..5a591f4 100644
--- a/tls.c
+++ b/tls.c
@@ -292,6 +292,7 @@ static int
has_match(char** list, const char* name, size_t name_len) {
char **item;
char *name_nullterminated = malloc(name_len+1);
+ CHECK_ALLOC(name_nullterminated, "malloc");
memcpy(name_nullterminated, name, name_len);
name_nullterminated[name_len]='\0';
@@ -309,9 +310,8 @@ has_match(char** list, const char* name, size_t name_len) {
struct TLSProtocol *
new_tls_data() {
struct TLSProtocol *tls_data = malloc(sizeof(struct TLSProtocol));
- if (tls_data != NULL) {
- tls_data->use_alpn = -1;
- }
+ CHECK_ALLOC(tls_data, "malloc");
+ tls_data->use_alpn = -1;
return tls_data;
}