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

Merge pull request #57122 from Faless/net/4.x_http_request_leak

Browse Source
This commit is contained in:
Rémi Verschelde 2022-01-24 17:01:08 +01:00 committed by GitHub
commit fc09d783f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
scene/main/http_request.cpp
View File

@ -442,30 +442,25 @@ void HTTPRequest::_request_done(int p_status, int p_code, const PackedStringArra
is_compressed = false; is_compressed = false;
} }
const PackedByteArray *data = nullptr;
if (accept_gzip && is_compressed && p_data.size() > 0) { if (accept_gzip && is_compressed && p_data.size() > 0) {
// Decompress request body // Decompress request body
PackedByteArray *decompressed = memnew(PackedByteArray); PackedByteArray decompressed;
int result = Compression::decompress_dynamic(decompressed, body_size_limit, p_data.ptr(), p_data.size(), mode); int result = Compression::decompress_dynamic(&decompressed, body_size_limit, p_data.ptr(), p_data.size(), mode);
if (result == OK) { if (result == OK) {
data = decompressed; emit_signal(SNAME("request_completed"), p_status, p_code, p_headers, decompressed);
return;
} else if (result == -5) { } else if (result == -5) {
WARN_PRINT("Decompressed size of HTTP response body exceeded body_size_limit"); WARN_PRINT("Decompressed size of HTTP response body exceeded body_size_limit");
p_status = RESULT_BODY_SIZE_LIMIT_EXCEEDED; p_status = RESULT_BODY_SIZE_LIMIT_EXCEEDED;
// Just return the raw data if we failed to decompress it // Just return the raw data if we failed to decompress it
data = &p_data;
} else { } else {
WARN_PRINT("Failed to decompress HTTP response body"); WARN_PRINT("Failed to decompress HTTP response body");
p_status = RESULT_BODY_DECOMPRESS_FAILED; p_status = RESULT_BODY_DECOMPRESS_FAILED;
// Just return the raw data if we failed to decompress it // Just return the raw data if we failed to decompress it
data = &p_data;
} }
} else {
data = &p_data;
} }
emit_signal(SNAME("request_completed"), p_status, p_code, p_headers, *data); emit_signal(SNAME("request_completed"), p_status, p_code, p_headers, p_data);
} }
void HTTPRequest::_notification(int p_what) { void HTTPRequest::_notification(int p_what) {