Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit71aaa9f

Browse files
committed
Add validation to connect and bind address
1 parent2586be4 commit71aaa9f

File tree

2 files changed

+38
-10
lines changed

2 files changed

+38
-10
lines changed

‎tests/snippets/stdlib_socket.py‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
importsocket
2+
fromtestutilsimportassertRaises
23

34
listener=socket.socket(socket.AF_INET,socket.SOCK_STREAM)
45
listener.bind(("127.0.0.1",8080))
@@ -22,3 +23,14 @@
2223
connector.close()
2324
listener.close()
2425

26+
s=socket.socket(socket.AF_INET,socket.SOCK_STREAM)
27+
withassertRaises(TypeError):
28+
s.connect(("127.0.0.1",8888,8888))
29+
30+
withassertRaises(TypeError):
31+
s.bind(("127.0.0.1",8888,8888))
32+
33+
withassertRaises(TypeError):
34+
s.bind((888,8888))
35+
36+
s.close()

‎vm/src/stdlib/socket.rs‎

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -128,11 +128,7 @@ fn socket_connect(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
128128
required =[(zelf,None),(address,Some(vm.ctx.tuple_type()))]
129129
);
130130

131-
let elements =get_elements(address);
132-
let host = objstr::get_value(&elements[0]);
133-
let port = objint::get_value(&elements[1]);
134-
135-
let address_string =format!("{}:{}", host, port.to_string());
131+
let address_string =get_address_string(vm, address)?;
136132

137133
letmut mut_obj = zelf.borrow_mut();
138134

@@ -157,11 +153,7 @@ fn socket_bind(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
157153
required =[(zelf,None),(address,Some(vm.ctx.tuple_type()))]
158154
);
159155

160-
let elements =get_elements(address);
161-
let host = objstr::get_value(&elements[0]);
162-
let port = objint::get_value(&elements[1]);
163-
164-
let address_string =format!("{}:{}", host, port.to_string());
156+
let address_string =get_address_string(vm, address)?;
165157

166158
letmut mut_obj = zelf.borrow_mut();
167159

@@ -179,6 +171,30 @@ fn socket_bind(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
179171
}
180172
}
181173

174+
fnget_address_string(
175+
vm:&mutVirtualMachine,
176+
address:&PyObjectRef,
177+
) ->Result<String,PyObjectRef>{
178+
let args =PyFuncArgs{
179+
args:get_elements(address).to_vec(),
180+
kwargs:vec![],
181+
};
182+
arg_check!(
183+
vm,
184+
args,
185+
required =[
186+
(host,Some(vm.ctx.str_type())),
187+
(port,Some(vm.ctx.int_type()))
188+
]
189+
);
190+
191+
Ok(format!(
192+
"{}:{}",
193+
objstr::get_value(host),
194+
objint::get_value(port).to_string()
195+
))
196+
}
197+
182198
fnsocket_listen(vm:&mutVirtualMachine,args:PyFuncArgs) ->PyResult{
183199
Ok(vm.get_none())
184200
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp