You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by vn...@apache.org on 2026/05/05 17:50:00 UTC
(guacamole-server) branch main updated (f076a54b -> c802cdce)
This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/guacamole-server.git
from f076a54b Merge patch branch changes to main.
add da9773fd GUACAMOLE-2035: Add start-up period to guacd health check in Dockerfile
add 4163ead8 GUACAMOLE-2035: Merge add start-up period to guacd health check in Dockerfile.
add d9b72b33 GUACAMOLE-2272: VNC: add MacRoman clipboard encoding support.
add 7ca6234a GUACAMOLE-2272: Merge add MacRoman clipboard encoding (server) support for VNC protocol.
add d35ed8f7 Merge 1.6.1 changes to patch branch.
new c802cdce Merge patch branch changes to main.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
Dockerfile | 2 +-
src/common/common/defaults.h | 8 +-
src/common/common/iconv.h | 24 ++
src/common/iconv.c | 514 +++++++++++++++++++++++++++--
src/common/tests/iconv/convert-test-data.c | 40 +++
src/common/tests/iconv/convert-test-data.h | 2 +-
src/common/tests/iconv/convert.c | 124 ++++++-
src/protocols/vnc/clipboard.c | 34 +-
src/protocols/vnc/clipboard.h | 2 +-
src/protocols/vnc/settings.c | 10 +-
10 files changed, 722 insertions(+), 38 deletions(-)
(guacamole-server) 01/01: Merge patch branch changes to main.
Posted by vn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/guacamole-server.git
commit c802cdce5627b4e0df77987878824cb167a1f9ba
Merge: f076a54b d35ed8f7
Author: Virtually Nick <vn...@apache.org>
AuthorDate: Tue May 5 13:49:34 2026 -0400
Merge patch branch changes to main.
Dockerfile | 2 +-
src/common/common/defaults.h | 8 +-
src/common/common/iconv.h | 24 ++
src/common/iconv.c | 514 +++++++++++++++++++++++++++--
src/common/tests/iconv/convert-test-data.c | 40 +++
src/common/tests/iconv/convert-test-data.h | 2 +-
src/common/tests/iconv/convert.c | 124 ++++++-
src/protocols/vnc/clipboard.c | 34 +-
src/protocols/vnc/clipboard.h | 2 +-
src/protocols/vnc/settings.c | 10 +-
10 files changed, 722 insertions(+), 38 deletions(-)
diff --cc src/protocols/vnc/clipboard.c
index 83334250,4af5b458..59674850
--- a/src/protocols/vnc/clipboard.c
+++ b/src/protocols/vnc/clipboard.c
@@@ -116,13 -110,7 +124,14 @@@ int guac_vnc_clipboard_blob_handler(gua
int guac_vnc_clipboard_end_handler(guac_user* user, guac_stream* stream) {
guac_vnc_client* vnc_client = (guac_vnc_client*) user->client->data;
+
+ /* Ignore end of stream if no clipboard structure is available to handle
+ * the data that was received */
+ guac_common_clipboard* clipboard = vnc_client->clipboard;
+ if (clipboard == NULL)
+ return 0;
+
+ guac_client* client = user->client;
rfbClient* rfb_client = vnc_client->rfb_client;
/* Send via VNC only if finished connecting */
@@@ -154,10 -142,15 +163,16 @@@
}
/* Fall back to classic clipboard with encoding conversion */
- char* output_data = guac_mem_alloc(GUAC_COMMON_CLIPBOARD_MAX_LENGTH);
+ int output_buf_size = clipboard->available;
+ char* output_data = guac_mem_alloc(output_buf_size);
+ if (output_data == NULL) {
+ guac_client_log(client, GUAC_LOG_WARNING,
+ "Clipboard conversion failed: unable to allocate output "
+ "buffer.");
+ return 1;
+ }
- const char* input = vnc_client->clipboard->buffer;
+ const char* input = clipboard->buffer;
char* output = output_data;
guac_iconv_write* writer = vnc_client->clipboard_writer;
@@@ -181,8 -173,13 +196,14 @@@ void guac_vnc_cut_text(rfbClient* clien
if (vnc_client->settings->disable_copy)
return;
- char* received_data = guac_mem_alloc(GUAC_COMMON_CLIPBOARD_MAX_LENGTH);
+ int output_buf_size = vnc_client->clipboard->available;
+ char* received_data = guac_mem_alloc(output_buf_size);
+ if (received_data == NULL) {
+ guac_client_log(gc, GUAC_LOG_WARNING,
+ "Clipboard conversion failed: unable to allocate receive "
+ "buffer.");
+ return;
+ }
const char* input = text;
char* output = received_data;