maride/guacamole-spice-protocol
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

GUACAMOLE-764: Merge correction to size of RDP file read/write offsets (all should be 64-bit).

Browse Source
This commit is contained in:
Mike Jumper 2019-04-09 11:25:15 -07:00 committed by GitHub
commit dc71987fca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/protocols/rdp/rdp_fs.c
View File

@ -402,7 +402,7 @@ int guac_rdp_fs_open(guac_rdp_fs* fs, const char* path,
}
int guac_rdp_fs_read(guac_rdp_fs* fs, int file_id, int offset,
int guac_rdp_fs_read(guac_rdp_fs* fs, int file_id, uint64_t offset,
void* buffer, int length) {
int bytes_read;
@ -426,7 +426,7 @@ int guac_rdp_fs_read(guac_rdp_fs* fs, int file_id, int offset,
}
int guac_rdp_fs_write(guac_rdp_fs* fs, int file_id, int offset,
int guac_rdp_fs_write(guac_rdp_fs* fs, int file_id, uint64_t offset,
void* buffer, int length) {
int bytes_written;

4
src/protocols/rdp/rdp_fs.h
View File

@ -487,7 +487,7 @@ int guac_rdp_fs_open(guac_rdp_fs* fs, const char* path,
* error occurs. All error codes are negative values and correspond to
* GUAC_RDP_FS constants, such as GUAC_RDP_FS_ENOENT.
*/
int guac_rdp_fs_read(guac_rdp_fs* fs, int file_id, int offset,
int guac_rdp_fs_read(guac_rdp_fs* fs, int file_id, uint64_t offset,
void* buffer, int length);
/**
@ -515,7 +515,7 @@ int guac_rdp_fs_read(guac_rdp_fs* fs, int file_id, int offset,
* occurs. All error codes are negative values and correspond to
* GUAC_RDP_FS constants, such as GUAC_RDP_FS_ENOENT.
*/
int guac_rdp_fs_write(guac_rdp_fs* fs, int file_id, int offset,
int guac_rdp_fs_write(guac_rdp_fs* fs, int file_id, uint64_t offset,
void* buffer, int length);
/**

2
src/protocols/rdp/rdp_stream.h
View File

@ -57,7 +57,7 @@ typedef struct guac_rdp_upload_status {
* The overall offset within the file that the next write should
* occur at.
*/
int offset;
uint64_t offset;
/**
* The ID of the file being written to.