merge bitcoin#23679: Sanitize port in addpeeraddress()

kwvg · kwvg · commit b376c097a210 · 2025-07-30T07:52:05.000Z
diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp
@@ -999,7 +999,7 @@ static RPCHelpMan addpeeraddress()
     }
 
     const std::string& addr_string{request.params[0].get_str()};
-    const uint16_t port = request.params[1].getInt<int>();
+    const auto port{request.params[1].getInt<uint16_t>()};
     const bool tried{request.params[2].isTrue()};
 
     UniValue obj(UniValue::VOBJ);
diff --git a/test/functional/rpc_net.py b/test/functional/rpc_net.py
@@ -341,6 +341,10 @@ def test_addpeeraddress(self):
         assert_equal(node.addpeeraddress(address="", port=8333), {"success": False})
         assert_equal(node.getnodeaddresses(count=0), [])
 
+        self.log.debug("Test that adding an address with invalid port fails")
+        assert_raises_rpc_error(-1, "JSON integer out of range", self.nodes[0].addpeeraddress, address="1.2.3.4", port=-1)
+        assert_raises_rpc_error(-1, "JSON integer out of range", self.nodes[0].addpeeraddress,address="1.2.3.4", port=65536)
+
         self.log.debug("Test that adding a valid address to the tried table succeeds")
         assert_equal(node.addpeeraddress(address="1.2.3.4", tried=True, port=8333), {"success": True})
         with node.assert_debug_log(expected_msgs=["CheckAddrman: new 0, tried 1, total 1 started"]):

Original file line number	Diff line number	Diff line change
`@@ -999,7 +999,7 @@ static RPCHelpMan addpeeraddress()`
`999`	`999`	`}`
`1000`	`1000`
`1001`	`1001`	`const std::string& addr_string{request.params[0].get_str()};`
`1002`		`- const uint16_t port = request.params[1].getInt<int>();`
	`1002`	`+ const auto port{request.params[1].getInt<uint16_t>()};`
`1003`	`1003`	`const bool tried{request.params[2].isTrue()};`
`1004`	`1004`
`1005`	`1005`	`UniValue obj(UniValue::VOBJ);`