lib/libssh2
1
0
Fork 0
mirror of https://github.com/libssh2/libssh2.git synced 2025-08-08 19:02:07 +03:00
Code Activity

libssh2_sftp.h: restore broken ABI

Browse Source 
Commit 41fbd44 changed variable sizes/types in a public struct which
broke the ABI, which breaks applications!

This reverts that change.

Closes #339
This commit is contained in:
Daniel Stenberg
2019-03-23 23:31:44 +01:00
parent 452517d96c
commit e1ead35e47
2 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/libssh2_sftp.h
View File

@@ -97,12 +97,12 @@ struct _LIBSSH2_SFTP_ATTRIBUTES {
/* If flags & ATTR_* bit is set, then the value in this struct will be /* If flags & ATTR_* bit is set, then the value in this struct will be
* meaningful Otherwise it should be ignored * meaningful Otherwise it should be ignored
*/ */
uint32_t flags; unsigned long flags;
libssh2_uint64_t filesize; libssh2_uint64_t filesize;
uint32_t uid, gid; unsigned long uid, gid;
uint32_t permissions; unsigned long permissions;
uint32_t atime, mtime; unsigned long atime, mtime;
}; };
struct _LIBSSH2_SFTP_STATVFS { struct _LIBSSH2_SFTP_STATVFS {

26
src/sftp.c
View File

@@ -671,18 +671,20 @@ sftp_attr2bin(unsigned char *p, const LIBSSH2_SFTP_ATTRIBUTES * attrs)
/* sftp_bin2attr /* sftp_bin2attr
*/ */
static int static int
sftp_bin2attr(LIBSSH2_SFTP_ATTRIBUTES * attrs, const unsigned char *p, sftp_bin2attr(LIBSSH2_SFTP_ATTRIBUTES *attrs, const unsigned char *p,
size_t data_len) size_t data_len)
{ {
struct string_buf buf; struct string_buf buf;
uint32_t flags = 0;
buf.data = (unsigned char *)p; buf.data = (unsigned char *)p;
buf.dataptr = buf.data; buf.dataptr = buf.data;
buf.len = data_len; buf.len = data_len;
buf.offset = 0; buf.offset = 0;
if(_libssh2_get_u32(&buf, &(attrs->flags)) != 0) { if(_libssh2_get_u32(&buf, &flags) != 0) {
return LIBSSH2_ERROR_BUFFER_TOO_SMALL; return LIBSSH2_ERROR_BUFFER_TOO_SMALL;
} }
attrs->flags = flags;
if(attrs->flags & LIBSSH2_SFTP_ATTR_SIZE) { if(attrs->flags & LIBSSH2_SFTP_ATTR_SIZE) {
if(_libssh2_get_u64(&buf, &(attrs->filesize)) != 0) { if(_libssh2_get_u64(&buf, &(attrs->filesize)) != 0) {
@@ -691,23 +693,33 @@ sftp_bin2attr(LIBSSH2_SFTP_ATTRIBUTES * attrs, const unsigned char *p,
} }
if(attrs->flags & LIBSSH2_SFTP_ATTR_UIDGID) { if(attrs->flags & LIBSSH2_SFTP_ATTR_UIDGID) {
if(_libssh2_get_u32(&buf, &(attrs->uid)) != 0 || uint32_t uid = 0;
_libssh2_get_u32(&buf, &(attrs->gid)) != 0) { uint32_t gid = 0;
if(_libssh2_get_u32(&buf, &uid) != 0 ||
_libssh2_get_u32(&buf, &gid) != 0) {
return LIBSSH2_ERROR_BUFFER_TOO_SMALL; return LIBSSH2_ERROR_BUFFER_TOO_SMALL;
} }
attrs->uid = uid;
attrs->uid = gid;
} }
if(attrs->flags & LIBSSH2_SFTP_ATTR_PERMISSIONS) { if(attrs->flags & LIBSSH2_SFTP_ATTR_PERMISSIONS) {
if(_libssh2_get_u32(&buf, &(attrs->permissions)) != 0) { uint32_t permissions;
if(_libssh2_get_u32(&buf, &permissions) != 0) {
return LIBSSH2_ERROR_BUFFER_TOO_SMALL; return LIBSSH2_ERROR_BUFFER_TOO_SMALL;
} }
attrs->permissions = permissions;
} }
if(attrs->flags & LIBSSH2_SFTP_ATTR_ACMODTIME) { if(attrs->flags & LIBSSH2_SFTP_ATTR_ACMODTIME) {
if(_libssh2_get_u32(&buf, &(attrs->atime)) != 0 || uint32_t atime;
_libssh2_get_u32(&buf, &(attrs->mtime)) != 0) { uint32_t mtime;
if(_libssh2_get_u32(&buf, &atime) != 0 ||
_libssh2_get_u32(&buf, &mtime) != 0) {
return LIBSSH2_ERROR_BUFFER_TOO_SMALL; return LIBSSH2_ERROR_BUFFER_TOO_SMALL;
} }
attrs->atime = atime;
attrs->atime = mtime;
} }
return (buf.dataptr - buf.data); return (buf.dataptr - buf.data);