Skip to content

GUACAMOLE-2153: Fix GUAC_*_UTF16 on big-endian machine #618

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+3 −2
Open

GUACAMOLE-2153: Fix GUAC_*_UTF16 on big-endian machine #618

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions src/common/iconv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@

#include <guacamole/unicode.h>
#include <stdint.h>
#include <endian.h>

/**
* Lookup table for Unicode code points, indexed by CP-1252 codepoint.
Expand Down Expand Up @@ -109,7 +110,7 @@ int GUAC_READ_UTF16(const char** input, int remaining) {
return 0;

/* Read two bytes as integer */
value = *((uint16_t*) *input);
value = le16toh(*((uint16_t*) *input));
*input += 2;

return value;
Expand Down Expand Up @@ -213,7 +214,7 @@ void GUAC_WRITE_UTF16(char** output, int remaining, int value) {
return;

/* Write two bytes as integer */
*((uint16_t*) *output) = value;
*((uint16_t*) *output) = htole16(value);
*output += 2;

}
Expand Down