Fix potential socket data read already into self._buffer #185
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dhalbert
reviewed
Jan 15, 2024
| @@ -113,6 +113,19 @@ def recv_into(self, buffer, nbytes: int = 0): | |||
| num_to_read = len(buffer) if nbytes == 0 else nbytes | |||
| num_read = 0 | |||
| while num_to_read > 0: | |||
| # we might have read socket data into the self._buffer with: | |||
| # esp32spi_wsgiserver: socket_readline | |||
There was a problem hiding this comment.
We discarded esp32spi_wsigiserver. Are there other circumstances where is could happen?
There was a problem hiding this comment.
I haven't checked any other libraries where _buffer is used, only https://github.com/adafruit/Adafruit_CircuitPython_WSGI/blob/main/adafruit_wsgi/esp32spi_wsgiserver.py
But i think is kinda of expected behavior and reasonable to use the _buffer, read as much as possible from the socket, because is not performant to read one bit at a time to find EOL for example.
This implementation also made into Adafruit_CircuitPython_Wiznet5k, adafruit_wiznet5k_socket _readline and adafruit_wiznet5k_wsgiserver so maybe is spread.
dhalbert
approved these changes
Jan 15, 2024
adafruit-adabot
added a commit
to adafruit/Adafruit_CircuitPython_Bundle
that referenced
this pull request
Jan 16, 2024
Updating https://github.com/adafruit/Adafruit_CircuitPython_ESP32SPI to 6.1.3 from 6.1.1: > Merge pull request adafruit/Adafruit_CircuitPython_ESP32SPI#185 from us3r64/fix/recv_into-self-_buffer > Merge pull request adafruit/Adafruit_CircuitPython_ESP32SPI#183 from us3r64/fix/socket-recv_into Updating https://github.com/adafruit/Adafruit_CircuitPython_Bundle/circuitpython_library_list.md to NA from NA: > Updated download stats for the libraries
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #186