GUACAMOLE-2002: Allow connection clipboard limits to be configured. #564
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
aleitner
reviewed
Nov 26, 2024
mike-jumper
requested changes
Nov 26, 2024
223c554 to
544663c
Compare
544663c to
a894101
Compare
mike-jumper
requested changes
Jan 21, 2025
| @@ -75,7 +75,7 @@ typedef struct guac_rdp_clipboard { | |||
| * A newly-allocated instance of guac_rdp_clipboard which has been | |||
| * initialized for processing Guacamole clipboard data. | |||
| */ | |||
| guac_rdp_clipboard* guac_rdp_clipboard_alloc(guac_client* client); | |||
| guac_rdp_clipboard* guac_rdp_clipboard_alloc(guac_client* client, int buffer_size); | |||
There was a problem hiding this comment.
Please document the parameters.
src/protocols/vnc/clipboard.c
Outdated
| @@ -103,20 +103,23 @@ int guac_vnc_clipboard_end_handler(guac_user* user, guac_stream* stream) { | |||
| guac_vnc_client* vnc_client = (guac_vnc_client*) user->client->data; | |||
| rfbClient* rfb_client = vnc_client->rfb_client; | |||
|
|
|||
| char output_data[GUAC_COMMON_CLIPBOARD_MAX_LENGTH]; | |||
| int output_buf_size = vnc_client->clipboard->available; | |||
There was a problem hiding this comment.
Depending on timing, vnc_client->clipboard might not have been allocated by guac_vnc_client_thread() by the time guac_vnc_clipboard_end_handler() is called for an inbound clipboard stream.
This may also be true for the other handlers for inbound instructions related to clipboard.
There was a problem hiding this comment.
- Added NULL check to the VNC functions the same it is done for RDP
- Moved RDP and VNC clipboard allocation into user join handlers. So now it happens before the client threads start. I believe this is not necessary for terminal based protocols because I had not moved guac_common_clipboard_alloc originally.
544ac9f to
32dbdfa
Compare
4ef5b32 to
5b070e5
Compare
5b070e5 to
44c1bd2
Compare
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.
Jira Discussion