mirrors/cosmopolitan
1
0
Fork 0
mirror of https://github.com/jart/cosmopolitan.git synced 2025-05-29 16:52:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix some glitches in redbean

Browse source 
This change includes a fix to Fetch() where an out of bounds memory read
could happen, when the reverse proxied endpoint omits the content-length
header. This caused a bunch of NUL chars to appear on TurfWar's /statusz
since it wouldn't actually overrun the buffer, and if it did it would've
been caught by MODE=asan builds.
This commit is contained in:
Justine Tunney 2022-11-02 09:42:52 -07:00
parent 14d036b68d
commit 6b06a8176d
No known key found for this signature in database
GPG key ID: BE714B4575D6E328
6 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libc/calls/poll.c
View file

@ -78,7 +78,7 @@ int poll(struct pollfd *fds, size_t nfds, int timeout_ms) {
rc = sys_poll_nt(fds, nfds, &millis, 0); rc = sys_poll_nt(fds, nfds, &millis, 0);
} }
STRACE("poll(%s, %'zu, %'d) → %d% lm\n", DescribePollFds(rc, fds, nfds), nfds, STRACE("poll(%s, %'zu, %'d) → %d% lm", DescribePollFds(rc, fds, nfds), nfds,
timeout_ms, rc); timeout_ms, rc);
return rc; return rc;
} }

2
libc/calls/ppoll.c
View file

@ -95,7 +95,7 @@ int ppoll(struct pollfd *fds, size_t nfds, const struct timespec *timeout,
rc = sys_poll_nt(fds, nfds, &millis, sigmask); rc = sys_poll_nt(fds, nfds, &millis, sigmask);
} }
STRACE("ppoll(%s, %'zu, %s, %s) → %d% lm\n", DescribePollFds(rc, fds, nfds), STRACE("ppoll(%s, %'zu, %s, %s) → %d% lm", DescribePollFds(rc, fds, nfds),
nfds, DescribeTimespec(0, timeout), DescribeSigset(0, sigmask), rc); nfds, DescribeTimespec(0, timeout), DescribeSigset(0, sigmask), rc);
return rc; return rc;
} }

2
libc/intrin/describecapability.c
View file

@ -69,7 +69,7 @@ static const struct thatispacked {
{CAP_CHECKPOINT_RESTORE, "CHECKPOINT_RESTORE"}, // {CAP_CHECKPOINT_RESTORE, "CHECKPOINT_RESTORE"}, //
}; };
const char *(DescribeCapability)(char buf[20], int x) { const char *(DescribeCapability)(char buf[32], int x) {
int i; int i;
for (i = 0; i < ARRAYLEN(kCapabilityName); ++i) { for (i = 0; i < ARRAYLEN(kCapabilityName); ++i) {
if (kCapabilityName[i].x == x) { if (kCapabilityName[i].x == x) {

4
libc/intrin/describeflags.internal.h
View file

@ -13,7 +13,7 @@ const char *DescribeFlags(char *, size_t, struct DescribeFlags *, size_t,
const char *, unsigned); const char *, unsigned);
const char *DescribeArchPrctlCode(char[12], int); const char *DescribeArchPrctlCode(char[12], int);
const char *DescribeCapability(char[20], int); const char *DescribeCapability(char[32], int);
const char *DescribeClockName(char[32], int); const char *DescribeClockName(char[32], int);
const char *DescribeDirfd(char[12], int); const char *DescribeDirfd(char[12], int);
const char *DescribeDnotifyFlags(char[80], int); const char *DescribeDnotifyFlags(char[80], int);
@ -67,7 +67,7 @@ const char *DescribeWhence(char[12], int);
const char *DescribeWhichPrio(char[12], int); const char *DescribeWhichPrio(char[12], int);
#define DescribeArchPrctlCode(x) DescribeArchPrctlCode(alloca(12), x) #define DescribeArchPrctlCode(x) DescribeArchPrctlCode(alloca(12), x)
#define DescribeCapability(x) DescribeCapability(alloca(20), x) #define DescribeCapability(x) DescribeCapability(alloca(32), x)
#define DescribeClockName(x) DescribeClockName(alloca(32), x) #define DescribeClockName(x) DescribeClockName(alloca(32), x)
#define DescribeDirfd(x) DescribeDirfd(alloca(12), x) #define DescribeDirfd(x) DescribeDirfd(alloca(12), x)
#define DescribeDnotifyFlags(x) DescribeDnotifyFlags(alloca(80), x) #define DescribeDnotifyFlags(x) DescribeDnotifyFlags(alloca(80), x)

2
tool/net/fetch.inc
View file

@ -364,7 +364,7 @@ static int LuaFetch(lua_State *L) {
break; break;
case kHttpClientStateBody: case kHttpClientStateBody:
if (!g) { if (!g) {
paylen = inbuf.n; paylen = inbuf.n - hdrsize;
goto Finished; goto Finished;
} }
break; break;

2
tool/net/redbean.c
View file

@ -6153,7 +6153,7 @@ static char *ServeAsset(struct Asset *a, const char *path, size_t pathlen) {
((cpm.contentlength >= 100 && _startswithi(ct, "text/")) || ((cpm.contentlength >= 100 && _startswithi(ct, "text/")) ||
(cpm.contentlength >= 1000 && (cpm.contentlength >= 1000 &&
MeasureEntropy(cpm.content, 1000) < 7))) { MeasureEntropy(cpm.content, 1000) < 7))) {
WARNF("serving compressed asset"); VERBOSEF("serving compressed asset");
p = ServeAssetCompressed(a); p = ServeAssetCompressed(a);
} else { } else {
p = ServeAssetIdentity(a, ct); p = ServeAssetIdentity(a, ct);