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

buffer: buffer_pack & unpack on non-gnu compilers

Browse Source
This commit is contained in:
Aris Adamantiadis
2015-02-08 18:49:32 +01:00
parent a653e27a2e
commit 940cb233ce
2 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/buffer.c
View File

@@ -710,7 +710,7 @@ int ssh_buffer_pack_va(struct ssh_buffer_struct *buffer,
for (p = format, count = 0; *p != '\0'; p++, count++) {
/* Invalid number of arguments passed */
if (count > argc) {
if (argc != -1 && count > argc) {
return SSH_ERROR;
}
@@ -782,7 +782,7 @@ int ssh_buffer_pack_va(struct ssh_buffer_struct *buffer,
}
}
if (argc != count) {
if (argc != -1 && argc != count) {
return SSH_ERROR;
}
@@ -790,7 +790,11 @@ int ssh_buffer_pack_va(struct ssh_buffer_struct *buffer,
/* Check if our canary is intact, if not somthing really bad happened */
uint32_t canary = va_arg(ap, uint32_t);
if (canary != SSH_BUFFER_PACK_END) {
abort();
if (argc == -1){
return SSH_ERROR;
} else {
abort();
}
}
}
return rc;
@@ -865,7 +869,7 @@ int ssh_buffer_unpack_va(struct ssh_buffer_struct *buffer,
for (p = format, count = 0; *p != '\0'; p++, count++) {
/* Invalid number of arguments passed */
if (count > argc) {
if (argc != -1 && count > argc) {
return SSH_ERROR;
}
@@ -956,7 +960,7 @@ int ssh_buffer_unpack_va(struct ssh_buffer_struct *buffer,
}
}
if (argc != count) {
if (argc != -1 && argc != count) {
rc = SSH_ERROR;
}
@@ -964,7 +968,11 @@ int ssh_buffer_unpack_va(struct ssh_buffer_struct *buffer,
/* Check if our canary is intact, if not somthing really bad happened */
uint32_t canary = va_arg(ap, uint32_t);
if (canary != SSH_BUFFER_PACK_END){
abort();
if (argc == -1){
rc = SSH_ERROR;
} else {
abort();
}
}
}