luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-20 17:22:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'backport-4281-socks4a-buffer-overflow-glib-2-82' into 'glib-2-82'

Browse Source 
Backport !4281 “gsocks4aproxy: Fix a single byte buffer overflow in connect messages” to glib-2-82

See merge request GNOME/glib!4282
This commit is contained in:
Philip Withnall 2024-09-19 20:51:27 +00:00
commit 211be419cf
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci.yml
View File

@ -571,6 +571,8 @@ vs2017-x64:
- win32-ps - win32-ps
needs: [] needs: []
variables: variables:
GIT_SUBMODULE_STRATEGY: recursive
GIT_SUBMODULE_DEPTH: 1
PYTHONUTF8: "1" PYTHONUTF8: "1"
script: script:
# FIXME: These should use --wrap-mode=nodownload but the Windows CI machines # FIXME: These should use --wrap-mode=nodownload but the Windows CI machines
@ -602,6 +604,8 @@ vs2017-x64-static:
- win32-ps - win32-ps
needs: [] needs: []
variables: variables:
GIT_SUBMODULE_STRATEGY: recursive
GIT_SUBMODULE_DEPTH: 1
PYTHONUTF8: "1" PYTHONUTF8: "1"
script: script:
# FIXME: These should use --wrap-mode=nodownload but the Windows CI machines # FIXME: These should use --wrap-mode=nodownload but the Windows CI machines

4
gio/gsocks4aproxy.c
View File

@ -79,9 +79,9 @@ g_socks4a_proxy_init (GSocks4aProxy *proxy)
* +----+----+----+----+----+----+----+----+----+----+....+----+------+....+------+ * +----+----+----+----+----+----+----+----+----+----+....+----+------+....+------+
* | VN | CD | DSTPORT | DSTIP | USERID |NULL| HOST | | NULL | * | VN | CD | DSTPORT | DSTIP | USERID |NULL| HOST | | NULL |
* +----+----+----+----+----+----+----+----+----+----+....+----+------+....+------+ * +----+----+----+----+----+----+----+----+----+----+....+----+------+....+------+
* 1 1 2 4 variable 1 variable * 1 1 2 4 variable 1 variable 1
*/ */
#define SOCKS4_CONN_MSG_LEN (9 + SOCKS4_MAX_LEN * 2) #define SOCKS4_CONN_MSG_LEN (10 + SOCKS4_MAX_LEN * 2)
static gint static gint
set_connect_msg (guint8 *msg, set_connect_msg (guint8 *msg,
const gchar *hostname, const gchar *hostname,