Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Properly raise the exception when the body exceeds the max size. #9145

Merged
merged 3 commits into from
Jan 18, 2021
Merged

Properly raise the exception when the body exceeds the max size. #9145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bebdba4
Properly raise the exception when the body exceeds the max size.
clokep Jan 18, 2021
a7de3a4
Merge remote-tracking branch 'origin/develop' into clokep/body-raisin…
clokep Jan 18, 2021
669f701
Fix another instance of the same bug.
clokep Jan 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/9145.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix "UnboundLocalError: local variable 'length' referenced before assignment" errors when the response body exceeds the expected size. This bug was introduced in v1.25.0.
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the error here is the same in both cases, although the stack would be different.

2 changes: 1 addition & 1 deletion synapse/http/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -724,7 +724,7 @@ async def get_file(
read_body_with_max_size(response, output_stream, max_size)
)
except BodyExceededMaxSize:
SynapseError(
raise SynapseError(
502,
"Requested file is too large > %r bytes" % (max_size,),
Codes.TOO_LARGE,
Expand Down
2 changes: 1 addition & 1 deletion synapse/http/matrixfederationclient.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -996,7 +996,7 @@ async def get_file(
logger.warning(
"{%s} [%s] %s", request.txn_id, request.destination, msg,
)
SynapseError(502, msg, Codes.TOO_LARGE)
raise SynapseError(502, msg, Codes.TOO_LARGE)
except Exception as e:
logger.warning(
"{%s} [%s] Error reading response: %s",
Expand Down