lib/libssh2
1
0
Fork 0
mirror of https://github.com/libssh2/libssh2.git synced 2025-11-02 10:53:16 +03:00
Code Activity

src: silence compiler warnings 2 (ZLIB interface)

Browse Source 
Silence warnings in the ZLIB interface by adding casts and changing
types.

See PR for individual commits.

Cherry-picked from #846
Closes #878
This commit is contained in:
Viktor Szakats
2023-03-26 09:36:13 +00:00
parent 02f2700a61
commit 463449fb9e
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/comp.c
View File

@@ -189,11 +189,11 @@ comp_method_zlib_comp(LIBSSH2_SESSION *session,
void **abstract) void **abstract)
{ {
z_stream *strm = *abstract; z_stream *strm = *abstract;
int out_maxlen = *dest_len; uInt out_maxlen = (uInt)*dest_len;
int status; int status;
strm->next_in = (unsigned char *) src; strm->next_in = (unsigned char *) src;
strm->avail_in = src_len; strm->avail_in = (uInt)src_len;
strm->next_out = dest; strm->next_out = dest;
strm->avail_out = out_maxlen; strm->avail_out = out_maxlen;
@@ -227,10 +227,10 @@ comp_method_zlib_decomp(LIBSSH2_SESSION * session,
/* A short-term alloc of a full data chunk is better than a series of /* A short-term alloc of a full data chunk is better than a series of
reallocs */ reallocs */
char *out; char *out;
size_t out_maxlen = src_len; size_t out_maxlen;
if(src_len <= SIZE_MAX / 4) if(src_len <= SIZE_MAX / 4)
out_maxlen = src_len * 4; out_maxlen = (uInt)src_len * 4;
else else
out_maxlen = payload_limit; out_maxlen = payload_limit;
@@ -247,10 +247,11 @@ comp_method_zlib_decomp(LIBSSH2_SESSION * session,
out_maxlen = payload_limit; out_maxlen = payload_limit;
strm->next_in = (unsigned char *) src; strm->next_in = (unsigned char *) src;
strm->avail_in = src_len; strm->avail_in = (uInt)src_len;
strm->next_out = (unsigned char *) LIBSSH2_ALLOC(session, out_maxlen); strm->next_out = (unsigned char *) LIBSSH2_ALLOC(session,
(uInt)out_maxlen);
out = (char *) strm->next_out; out = (char *) strm->next_out;
strm->avail_out = out_maxlen; strm->avail_out = (uInt)out_maxlen;
if(!strm->next_out) if(!strm->next_out)
return _libssh2_error(session, LIBSSH2_ERROR_ALLOC, return _libssh2_error(session, LIBSSH2_ERROR_ALLOC,
"Unable to allocate decompression buffer"); "Unable to allocate decompression buffer");
@@ -299,7 +300,7 @@ comp_method_zlib_decomp(LIBSSH2_SESSION * session,
} }
out = newout; out = newout;
strm->next_out = (unsigned char *) out + out_ofs; strm->next_out = (unsigned char *) out + out_ofs;
strm->avail_out = out_maxlen - out_ofs; strm->avail_out = (uInt)(out_maxlen - out_ofs);
} }
*dest = (unsigned char *) out; *dest = (unsigned char *) out;