From: Sebastian Ramadan <plebbyastian@gmail.com>
Date: Sat, 16 Dec 2017 23:21:47 +0000 (+0100)
Subject: Transmit phpdbg webdata len in little-endian
X-Git-Tag: php-7.3.0alpha1~778
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=168c6cda8f906b72025f9cd9aadad48553dd5764;p=php

Transmit phpdbg webdata len in little-endian

Rather than using machine-endianness through a UB cast.
---

diff --git a/sapi/phpdbg/phpdbg_rinit_hook.c b/sapi/phpdbg/phpdbg_rinit_hook.c
index 667f32ea1a..c62b272a16 100644
--- a/sapi/phpdbg/phpdbg_rinit_hook.c
+++ b/sapi/phpdbg/phpdbg_rinit_hook.c
@@ -56,9 +56,9 @@ static PHP_RINIT_FUNCTION(phpdbg_webhelper) /* {{{ */
 	{
 		struct sockaddr_un sock;
 		int s = socket(AF_UNIX, SOCK_STREAM, 0);
-		int len = strlen(PHPDBG_WG(path)) + sizeof(sock.sun_family);
+		size_t len = strlen(PHPDBG_WG(path)) + sizeof(sock.sun_family);
 		char buf[(1 << 8) + 1];
-		int buflen;
+		ssize_t buflen;
 		sock.sun_family = AF_UNIX;
 		strcpy(sock.sun_path, PHPDBG_WG(path));
 
@@ -67,11 +67,15 @@ static PHP_RINIT_FUNCTION(phpdbg_webhelper) /* {{{ */
 		}
 
 		char *msg = NULL;
-		char msglen[5] = {0};
-		phpdbg_webdata_compress(&msg, (int *)msglen);
-
-		send(s, msglen, 4, 0);
-		send(s, msg, *(int *) msglen, 0);
+		size_t msglen = 0;
+		phpdbg_webdata_compress(&msg, &msglen);
+
+		buf[0] = (msglen >>  0) & 0xff;
+		buf[1] = (msglen >>  8) & 0xff;
+		buf[2] = (msglen >> 16) & 0xff;
+		buf[3] = (msglen >> 24) & 0xff;
+		send(s, buf, 4, 0);
+		send(s, msg, msglen, 0);
 
 		while ((buflen = recv(s, buf, sizeof(buf) - 1, 0)) > 0) {
 			php_write(buf, buflen);
diff --git a/sapi/phpdbg/phpdbg_webdata_transfer.c b/sapi/phpdbg/phpdbg_webdata_transfer.c
index 411ee9238f..5cb6ea4a2d 100644
--- a/sapi/phpdbg/phpdbg_webdata_transfer.c
+++ b/sapi/phpdbg/phpdbg_webdata_transfer.c
@@ -27,7 +27,7 @@ static int phpdbg_is_auto_global(char *name, int len) {
 	return ret;
 }
 
-PHPDBG_API void phpdbg_webdata_compress(char **msg, int *len) {
+PHPDBG_API void phpdbg_webdata_compress(char **msg, size_t *len) {
 	zval array;
 	HashTable *ht;
 	zval zv[9] = {{{0}}};
diff --git a/sapi/phpdbg/phpdbg_webdata_transfer.h b/sapi/phpdbg/phpdbg_webdata_transfer.h
index b8da8c1fd3..b8473d30ef 100644
--- a/sapi/phpdbg/phpdbg_webdata_transfer.h
+++ b/sapi/phpdbg/phpdbg_webdata_transfer.h
@@ -22,6 +22,6 @@
 #include "zend.h"
 #include "phpdbg.h"
 
-PHPDBG_API void phpdbg_webdata_compress(char **msg, int *len);
+PHPDBG_API void phpdbg_webdata_compress(char **msg, size_t *len);
 
 #endif /* PHPDBG_WEBDATA_TRANSFER_H */