godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't memcpy to nullptr even if length is zero

This commit is contained in:
Haoyu Qiu 2021-09-29 20:54:43 +08:00
parent 4c1d2e9350
commit 9dd0d3f550
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scene/main/http_request.cpp
View File

@ -104,9 +104,11 @@ Error HTTPRequest::request(const String &p_url, const Vector<String> &p_custom_h
CharString charstr = p_request_data.utf8(); CharString charstr = p_request_data.utf8();
size_t len = charstr.length(); size_t len = charstr.length();
if (len > 0) {
raw_data.resize(len); raw_data.resize(len);
uint8_t *w = raw_data.ptrw(); uint8_t *w = raw_data.ptrw();
memcpy(w, charstr.ptr(), len); memcpy(w, charstr.ptr(), len);
}
return request_raw(p_url, p_custom_headers, p_ssl_validate_domain, p_method, raw_data); return request_raw(p_url, p_custom_headers, p_ssl_validate_domain, p_method, raw_data);
} }

2
servers/physics_3d/soft_body_3d_sw.cpp
View File

@ -249,8 +249,10 @@ void SoftBody3DSW::update_area() {
// Node area. // Node area.
LocalVector<int> counts; LocalVector<int> counts;
if (nodes.size() > 0) {
counts.resize(nodes.size()); counts.resize(nodes.size());
memset(counts.ptr(), 0, counts.size() * sizeof(int)); memset(counts.ptr(), 0, counts.size() * sizeof(int));
}
for (i = 0, ni = nodes.size(); i < ni; ++i) { for (i = 0, ni = nodes.size(); i < ni; ++i) {
nodes[i].area = 0.0; nodes[i].area = 0.0;