lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-11-30 13:01:23 +03:00
Code Activity

channels: Fix incorrect return values in ssh_channel_write().

Browse Source
This commit is contained in:
Andreas Schneider
2011-08-10 16:37:29 +02:00
parent 7949f2cdc6
commit 13227714f2
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/channels.c
View File

@@ -22,6 +22,7 @@
* MA 02111-1307, USA. * MA 02111-1307, USA.
*/ */
#include <limits.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
@@ -1148,7 +1149,7 @@ error:
int channel_write_common(ssh_channel channel, const void *data, int channel_write_common(ssh_channel channel, const void *data,
uint32_t len, int is_stderr) { uint32_t len, int is_stderr) {
ssh_session session; ssh_session session;
int origlen = len; uint32_t origlen = len;
size_t effectivelen; size_t effectivelen;
size_t maxpacketlen; size_t maxpacketlen;
@@ -1160,6 +1161,13 @@ int channel_write_common(ssh_channel channel, const void *data,
ssh_set_error_invalid(session, __FUNCTION__); ssh_set_error_invalid(session, __FUNCTION__);
return -1; return -1;
} }
if (len > INT_MAX) {
ssh_log(session, SSH_LOG_PROTOCOL,
"Length (%u) is bigger than INT_MAX", len);
return SSH_ERROR;
}
enter_function(); enter_function();
/* /*
@@ -1202,7 +1210,7 @@ int channel_write_common(ssh_channel channel, const void *data,
/* nothing can be written */ /* nothing can be written */
ssh_log(session, SSH_LOG_PROTOCOL, ssh_log(session, SSH_LOG_PROTOCOL,
"Wait for a growing window message..."); "Wait for a growing window message...");
return 0; goto out;
} }
effectivelen = len > channel->remote_window ? channel->remote_window : len; effectivelen = len > channel->remote_window ? channel->remote_window : len;
} else { } else {
@@ -1242,8 +1250,10 @@ int channel_write_common(ssh_channel channel, const void *data,
data = ((uint8_t*)data + effectivelen); data = ((uint8_t*)data + effectivelen);
} }
out:
leave_function(); leave_function();
return origlen; return (int)(origlen - len);
error: error:
buffer_reinit(session->out_buffer); buffer_reinit(session->out_buffer);