CLI server: make all heap chunks self contained - #23745
Open
DanielEScherzer wants to merge 2 commits into
Open
DanielEScherzer wants to merge 2 commits into
DanielEScherzer wants to merge 2 commits into
Conversation
For chunks that were pointing to heap data outside of the chunk itself, ASAN would report some memory leaks. Rather than trying to figure out exactly where the right place to free that data is, just copy the data into a self-contained chunk. While this might not be the best option from a performance perspective, the CLI server is meant only as a development tool and accordingly performance is not a major concern. The static `php_cli_server_chunk_heap_new()` function was removed, additional cleanup will be done in subsequent commits.
Now that all heap allocations are self contained, the block is always the same as the overall chunk; remove the unneeded field. Additionally, `php_cli_server_chunk_dtor()`, which only acts for heap allocations for which the block was different than the chunk, is no longer needed and is removed.
Member
Author
|
I wasn't able to figure out a phpt test to show the leak, but was able to reproduce it reliably with Details#!/bin/bash
php -d post_max_size=8M -d memory_limit=128M -S 127.0.0.1:8001 &
PID=$!
echo "PID:"
echo $PID
sleep 2
python3 /var/www/html/leak.py --pid $PID
cleanup() {
kill -INT $PID
}
trap cleanup EXITwhere that python file is #!/usr/bin/env python3
import socket
payload = b"B" * (8 * 1024 * 1024)
chunk_hdr = f"800000\r\n".encode()
chunk = chunk_hdr + payload + b"\r\n"
req_head = (
f"POST / HTTP/1.1\r\n"
f"Transfer-Encoding: chunked\r\n"
f"Content-Type: application/octet-stream\r\n"
f"Connection: close\r\n"
f"\r\n"
).encode()
s = socket.create_connection(("127.0.0.1", 8001), timeout=10)
s.settimeout(None)
s.sendall(req_head)
s.sendall(chunk)
s.sendall(chunk) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
For chunks that were pointing to heap data outside of the chunk itself, ASAN would report some memory leaks. Rather than trying to figure out exactly where the right place to free that data is, just copy the data into a self-contained chunk. While this might not be the best option from a performance perspective, the CLI server is meant only as a development tool and accordingly performance is not a major concern.
The static
php_cli_server_chunk_heap_new()function was removed.The
php_cli_server_chunk.data.heap.blockpointer was removed. Now that all heap allocations are self contained, the block is always the same as the overall chunk; remove the unneeded field. Additionally,php_cli_server_chunk_dtor(), which only acts for heap allocations for which the block was different than the chunk, is no longer needed and is removed.