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

5
include/libssh/priv.h
View File

@@ -304,6 +304,7 @@ int match_hostname(const char *host, const char *pattern, unsigned int len);
/** /**
* Get the argument cound of variadic arguments * Get the argument cound of variadic arguments
*/ */
#ifdef HAVE_GCC_NARG_MACRO
#define __VA_NARG__(...) \ #define __VA_NARG__(...) \
(__VA_NARG_(_0, ## __VA_ARGS__, __RSEQ_N()) - 1) (__VA_NARG_(_0, ## __VA_ARGS__, __RSEQ_N()) - 1)
#define __VA_NARG_(...) \ #define __VA_NARG_(...) \
@@ -324,6 +325,10 @@ int match_hostname(const char *host, const char *pattern, unsigned int len);
29, 28, 27, 26, 25, 24, 23, 22, 21, 20, \ 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, \
19, 18, 17, 16, 15, 14, 13, 12, 11, 10, \ 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, \
9, 8, 7, 6, 5, 4, 3, 2, 1, 0 9, 8, 7, 6, 5, 4, 3, 2, 1, 0
#else
/* clang does not support the above construction */
#define __VA_NARG__(...) (-1)
#endif
#endif /* _LIBSSH_PRIV_H */ #endif /* _LIBSSH_PRIV_H */
/* vim: set ts=4 sw=4 et cindent: */ /* vim: set ts=4 sw=4 et cindent: */

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++) { for (p = format, count = 0; *p != '\0'; p++, count++) {
/* Invalid number of arguments passed */ /* Invalid number of arguments passed */
if (count > argc) { if (argc != -1 && count > argc) {
return SSH_ERROR; 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; 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 */ /* Check if our canary is intact, if not somthing really bad happened */
uint32_t canary = va_arg(ap, uint32_t); uint32_t canary = va_arg(ap, uint32_t);
if (canary != SSH_BUFFER_PACK_END) { if (canary != SSH_BUFFER_PACK_END) {
abort(); if (argc == -1){
return SSH_ERROR;
} else {
abort();
}
} }
} }
return rc; 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++) { for (p = format, count = 0; *p != '\0'; p++, count++) {
/* Invalid number of arguments passed */ /* Invalid number of arguments passed */
if (count > argc) { if (argc != -1 && count > argc) {
return SSH_ERROR; 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; 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 */ /* Check if our canary is intact, if not somthing really bad happened */
uint32_t canary = va_arg(ap, uint32_t); uint32_t canary = va_arg(ap, uint32_t);
if (canary != SSH_BUFFER_PACK_END){ if (canary != SSH_BUFFER_PACK_END){
abort(); if (argc == -1){
rc = SSH_ERROR;
} else {
abort();
}
} }
} }