You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by jm...@apache.org on 2017/07/06 02:32:52 UTC
[1/2] incubator-guacamole-server git commit: GUACAMOLE-303: Ensure
there is always space for the null terminator when normalizing.
Repository: incubator-guacamole-server
Updated Branches:
refs/heads/master 07db9808a -> 3fdd1e973
GUACAMOLE-303: Ensure there is always space for the null terminator when normalizing.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/commit/7857dd0a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/7857dd0a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/7857dd0a
Branch: refs/heads/master
Commit: 7857dd0a9ae1097aa1a33d8cbb22058078eb1225
Parents: 07db980
Author: Michael Jumper <mj...@apache.org>
Authored: Tue Jul 4 12:00:43 2017 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Tue Jul 4 12:00:43 2017 -0700
----------------------------------------------------------------------
src/common-ssh/sftp.c | 2 +-
src/protocols/rdp/rdp_fs.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/7857dd0a/src/common-ssh/sftp.c
----------------------------------------------------------------------
diff --git a/src/common-ssh/sftp.c b/src/common-ssh/sftp.c
index e0e029f..8a53b26 100644
--- a/src/common-ssh/sftp.c
+++ b/src/common-ssh/sftp.c
@@ -77,7 +77,7 @@ static int guac_common_ssh_sftp_normalize_path(char* fullpath,
strncpy(path_component_data, path, sizeof(path_component_data) - 1);
/* Find path components within path */
- for (i = 0; i < sizeof(path_component_data); i++) {
+ for (i = 0; i < sizeof(path_component_data) - 1; i++) {
/* If current character is a path separator, parse as component */
char c = path_component_data[i];
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/7857dd0a/src/protocols/rdp/rdp_fs.c
----------------------------------------------------------------------
diff --git a/src/protocols/rdp/rdp_fs.c b/src/protocols/rdp/rdp_fs.c
index 88668d8..ab48cc2 100644
--- a/src/protocols/rdp/rdp_fs.c
+++ b/src/protocols/rdp/rdp_fs.c
@@ -622,10 +622,10 @@ int guac_rdp_fs_normalize_path(const char* path, char* abs_path) {
path++;
/* Copy path into component data for parsing */
- strncpy(path_component_data, path, GUAC_RDP_FS_MAX_PATH-1);
+ strncpy(path_component_data, path, sizeof(path_component_data) - 1);
/* Find path components within path */
- for (i=0; i<GUAC_RDP_FS_MAX_PATH; i++) {
+ for (i = 0; i < sizeof(path_component_data) - 1; i++) {
/* If current character is a path separator, parse as component */
char c = path_component_data[i];
[2/2] incubator-guacamole-server git commit: GUACAMOLE-303: Merge
null terminator overflow fix.
Posted by jm...@apache.org.
GUACAMOLE-303: Merge null terminator overflow fix.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/commit/3fdd1e97
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/3fdd1e97
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/3fdd1e97
Branch: refs/heads/master
Commit: 3fdd1e973af287e87b7a9308f60f4166c456c6b8
Parents: 836fc3e 7857dd0
Author: James Muehlner <ja...@guac-dev.org>
Authored: Wed Jul 5 19:31:10 2017 -0700
Committer: James Muehlner <ja...@guac-dev.org>
Committed: Wed Jul 5 19:31:10 2017 -0700
----------------------------------------------------------------------
src/common-ssh/common-ssh/sftp.h | 21 ++-
src/common-ssh/sftp.c | 259 ++++++++++++++++++++++++++++++++--
src/protocols/rdp/rdp.c | 4 +-
src/protocols/rdp/rdp_fs.c | 4 +-
src/protocols/rdp/rdp_settings.c | 13 ++
src/protocols/rdp/rdp_settings.h | 6 +
src/protocols/ssh/settings.c | 15 ++
src/protocols/ssh/settings.h | 6 +
src/protocols/ssh/ssh.c | 3 +-
src/protocols/vnc/settings.c | 13 ++
src/protocols/vnc/settings.h | 6 +
src/protocols/vnc/vnc.c | 4 +-
12 files changed, 334 insertions(+), 20 deletions(-)
----------------------------------------------------------------------