Use 1-byte alignment/packing for socks4. Fixes #2595

2026-10-21 19:32:18 +00:00 · 2026-05-26 01:52:17 +00:00 · 2026-05-26 01:52:17 +00:00 · 947f53c079
commit 947f53c079
parent ff028e681f
2 changed files with 6 additions and 0 deletions
--- a/4
+++ b/4
@ -1,5 +1,9 @@
 #Nmap Changelog ($Id$); -*-text-*-

+o [Nsock][GH#2595] Fix an issue where Nsock's SOCKS4 proxy code would send
+  additional null bytes on Windows and other platforms where the compiler does
+  not understand __attribute__((packed)). [Daniel Miller]
+
 o The --release-memory option is now a no-op. Nmap will always run finalization
  routines that release allocated memory before closing.

--- a/nsock/src/proxy_socks4.c
+++ b/nsock/src/proxy_socks4.c
@ -64,6 +64,7 @@
 extern const struct proxy_spec ProxySpecSocks4;


+#pragma pack(push, 1)
 struct socks4_data {
    uint8_t  version;
    uint8_t  type;
@ -71,6 +72,7 @@ struct socks4_data {
    uint32_t address;
    uint8_t  null;
 } __attribute__((packed));
+#pragma pack(pop)


 static int proxy_socks4_node_new(struct proxy_node **node, const struct uri *uri) {