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

Fix chunked splicing

Browse Source
This commit is contained in:
Lorenz Stechauner
2022-11-10 20:21:25 +01:00
parent bc7c3591a2
commit 89a9d4b9d6
2 changed files with 34 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/lib/fastcgi.c
View File

@ -628,9 +628,24 @@ int fastcgi_receive_chunked(fastcgi_conn *conn, sock *client) {
while (1) { while (1) {
ret = sock_recv(client, tmp, sizeof(tmp), MSG_PEEK); ret = sock_recv(client, tmp, sizeof(tmp), MSG_PEEK);
if (ret < 0) return -2; if (ret < 0) return -2;
else if (ret < 2) continue;
int len = 0;
for (int i = 0; i < ret; i++) {
char ch = tmp[i];
if (ch == '\r') {
continue;
} else if (ch == '\n') {
len = i + 1;
break;
} else if (!((ch >= '0' && ch <= '9') || (ch >= 'a' && ch <= 'f') || (ch >= 'A' && ch <= 'F'))) {
return -2;
}
}
if (len == 0) continue;
next_len = strtol(tmp, NULL, 16); next_len = strtol(tmp, NULL, 16);
char *ptr = strstr(tmp, "\r\n"); ret = sock_recv(client, tmp, len, 0);
ret = sock_recv(client, tmp, ptr - tmp + 2, 0);
if (ret < 0) return -2; if (ret < 0) return -2;
if (next_len <= 0) break; if (next_len <= 0) break;

19
src/lib/sock.c
View File

@ -112,9 +112,24 @@ long sock_splice_chunked(sock *dst, sock *src, void *buf, unsigned long buf_len)
while (1) { while (1) {
ret = sock_recv(src, tmp, sizeof(tmp), MSG_PEEK); ret = sock_recv(src, tmp, sizeof(tmp), MSG_PEEK);
if (ret < 0) return -2; if (ret < 0) return -2;
else if (ret < 2) continue;
int len = 0;
for (int i = 0; i < ret; i++) {
char ch = tmp[i];
if (ch == '\r') {
continue;
} else if (ch == '\n') {
len = i + 1;
break;
} else if (!((ch >= '0' && ch <= '9') || (ch >= 'a' && ch <= 'f') || (ch >= 'A' && ch <= 'F'))) {
return -2;
}
}
if (len == 0) continue;
next_len = strtol(tmp, NULL, 16); next_len = strtol(tmp, NULL, 16);
char *ptr = strstr(tmp, "\r\n"); ret = sock_recv(src, tmp, len, 0);
ret = sock_recv(src, tmp, ptr - tmp + 2, 0);
if (ret < 0) return -2; if (ret < 0) return -2;
if (next_len <= 0) break; if (next_len <= 0) break;