87 lines
2.9 KiB
Diff
87 lines
2.9 KiB
Diff
|
From 462092a48aa0dbad24d9fa8a4a9d418faa14d309 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Niels Dossche <7771979+nielsdos@users.noreply.github.com>
|
||
|
|
Date: Sat, 9 Nov 2024 15:29:52 +0100
|
||
|
|
Subject: [PATCH 6/8] Fix GHSA-4w77-75f9-2c8w
|
||
|
|
|
||
|
|
(cherry picked from commit 7dd336ae838bbf2c62dc47e3c900d657d3534c02)
|
||
|
|
---
|
||
|
|
sapi/cli/php_cli_server.c | 6 +---
|
||
|
|
sapi/cli/tests/ghsa-4w77-75f9-2c8w.phpt | 41 +++++++++++++++++++++++++
|
||
|
|
2 files changed, 42 insertions(+), 5 deletions(-)
|
||
|
|
create mode 100644 sapi/cli/tests/ghsa-4w77-75f9-2c8w.phpt
|
||
|
|
|
||
|
|
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c
|
||
|
|
index 295448f1211..5104318a634 100644
|
||
|
|
--- a/sapi/cli/php_cli_server.c
|
||
|
|
+++ b/sapi/cli/php_cli_server.c
|
||
|
|
@@ -1863,8 +1863,6 @@ static size_t php_cli_server_client_send_through(php_cli_server_client *client,
|
||
|
|
|
||
|
|
static void php_cli_server_client_populate_request_info(const php_cli_server_client *client, sapi_request_info *request_info) /* {{{ */
|
||
|
|
{
|
||
|
|
- char *val;
|
||
|
|
-
|
||
|
|
request_info->request_method = php_http_method_str(client->request.request_method);
|
||
|
|
request_info->proto_num = client->request.protocol_version;
|
||
|
|
request_info->request_uri = client->request.request_uri;
|
||
|
|
@@ -1872,9 +1870,7 @@ static void php_cli_server_client_populate_request_info(const php_cli_server_cli
|
||
|
|
request_info->query_string = client->request.query_string;
|
||
|
|
request_info->content_length = client->request.content_len;
|
||
|
|
request_info->auth_user = request_info->auth_password = request_info->auth_digest = NULL;
|
||
|
|
- if (NULL != (val = zend_hash_str_find_ptr(&client->request.headers, "content-type", sizeof("content-type")-1))) {
|
||
|
|
- request_info->content_type = val;
|
||
|
|
- }
|
||
|
|
+ request_info->content_type = zend_hash_str_find_ptr(&client->request.headers, "content-type", sizeof("content-type")-1);
|
||
|
|
} /* }}} */
|
||
|
|
|
||
|
|
static void destroy_request_info(sapi_request_info *request_info) /* {{{ */
|
||
|
|
diff --git a/sapi/cli/tests/ghsa-4w77-75f9-2c8w.phpt b/sapi/cli/tests/ghsa-4w77-75f9-2c8w.phpt
|
||
|
|
new file mode 100644
|
||
|
|
index 00000000000..2c8aeff12d5
|
||
|
|
--- /dev/null
|
||
|
|
+++ b/sapi/cli/tests/ghsa-4w77-75f9-2c8w.phpt
|
||
|
|
@@ -0,0 +1,41 @@
|
||
|
|
+--TEST--
|
||
|
|
+GHSA-4w77-75f9-2c8w (Heap-Use-After-Free in sapi_read_post_data Processing in CLI SAPI Interface)
|
||
|
|
+--INI--
|
||
|
|
+allow_url_fopen=1
|
||
|
|
+--SKIPIF--
|
||
|
|
+<?php
|
||
|
|
+include "skipif.inc";
|
||
|
|
+?>
|
||
|
|
+--FILE--
|
||
|
|
+<?php
|
||
|
|
+include "php_cli_server.inc";
|
||
|
|
+
|
||
|
|
+$serverCode = <<<'CODE'
|
||
|
|
+var_dump(file_get_contents('php://input'));
|
||
|
|
+CODE;
|
||
|
|
+
|
||
|
|
+php_cli_server_start($serverCode, null, []);
|
||
|
|
+
|
||
|
|
+$options = [
|
||
|
|
+ "http" => [
|
||
|
|
+ "method" => "POST",
|
||
|
|
+ "header" => "Content-Type: application/x-www-form-urlencoded",
|
||
|
|
+ "content" => "AAAAA",
|
||
|
|
+ ],
|
||
|
|
+];
|
||
|
|
+$context = stream_context_create($options);
|
||
|
|
+
|
||
|
|
+echo file_get_contents("http://" . PHP_CLI_SERVER_ADDRESS . "/", context: $context);
|
||
|
|
+
|
||
|
|
+$options = [
|
||
|
|
+ "http" => [
|
||
|
|
+ "method" => "POST",
|
||
|
|
+ ],
|
||
|
|
+];
|
||
|
|
+$context = stream_context_create($options);
|
||
|
|
+
|
||
|
|
+echo file_get_contents("http://" . PHP_CLI_SERVER_ADDRESS . "/", context: $context);
|
||
|
|
+?>
|
||
|
|
+--EXPECT--
|
||
|
|
+string(5) "AAAAA"
|
||
|
|
+string(0) ""
|
||
|
|
--
|
||
|
|
2.47.0
|
||
|
|
|