lorenz.stechauner/sesimos
1
1
Fork 0
Code Issues Pull Requests Projects Releases Activity

Fix proxy pointer arithmetic

Browse Source
This commit is contained in:
Lorenz Stechauner
2022-12-31 11:44:52 +01:00
parent 6eb3b99bfb
commit abb40a659c
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/lib/proxy.c
View File

@ -22,7 +22,7 @@
#include <netdb.h> #include <netdb.h>
static SSL_CTX *proxy_ctx = NULL; static SSL_CTX *proxy_ctx = NULL;
static void *proxies = NULL; static proxy_ctx_t *proxies = NULL;
int proxy_preload(void) { int proxy_preload(void) {
int n = 0; int n = 0;
@ -35,8 +35,8 @@ int proxy_preload(void) {
// FIXME return value check // FIXME return value check
proxy_ctx = SSL_CTX_new(TLS_client_method()); proxy_ctx = SSL_CTX_new(TLS_client_method());
proxies = malloc(n * PROXY_ARRAY_SIZE); proxies = malloc(n * MAX_PROXY_CNX_PER_HOST * sizeof(proxy_ctx_t));
memset(proxies, 0, n * PROXY_ARRAY_SIZE); memset(proxies, 0, n * MAX_PROXY_CNX_PER_HOST * sizeof(proxy_ctx_t));
return 0; return 0;
} }
@ -57,11 +57,10 @@ static proxy_ctx_t *proxy_get_by_conf(host_config_t *conf) {
n++; n++;
} }
void *ptr = proxies + n * PROXY_ARRAY_SIZE; proxy_ctx_t *ptr = proxies + n * MAX_PROXY_CNX_PER_HOST;
for (int i = 0; i < MAX_PROXY_CNX_PER_HOST; i++, ptr += PROXY_ARRAY_SIZE) { for (int i = 0; i < MAX_PROXY_CNX_PER_HOST; i++, ptr++) {
proxy_ctx_t *ctx = ptr; if (!ptr->in_use) {
if (!ctx->in_use) { return ptr;
return ctx;
} }
} }

2
src/lib/proxy.h
View File

@ -18,8 +18,6 @@
# define SERVER_NAME "reverse proxy" # define SERVER_NAME "reverse proxy"
#endif #endif
#define PROXY_ARRAY_SIZE (MAX_PROXY_CNX_PER_HOST * sizeof(proxy_ctx_t))
#include "http.h" #include "http.h"
#include "config.h" #include "config.h"