shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-09 18:04:25 +09:00
Code Issues Packages Projects Releases Wiki Activity

gzip: Use SSH_BUFFER_FREE()

Browse Source 
Fixes T183

Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
Reviewed-by: Jakub Jelen <jjelen@redhat.com>
(cherry picked from commit 6c79ed9801)
This commit is contained in:
Andreas Schneider
2019-11-05 13:18:32 +01:00
parent 975eb87c19
commit ad49f0a556
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/gzip.c
View File

@@ -90,14 +90,14 @@ static ssh_buffer gzip_compress(ssh_session session, ssh_buffer source, int leve
zout->avail_out = BLOCKSIZE; zout->avail_out = BLOCKSIZE;
status = deflate(zout, Z_PARTIAL_FLUSH); status = deflate(zout, Z_PARTIAL_FLUSH);
if (status != Z_OK) { if (status != Z_OK) {
ssh_buffer_free(dest); SSH_BUFFER_FREE(dest);
ssh_set_error(session, SSH_FATAL, ssh_set_error(session, SSH_FATAL,
"status %d deflating zlib packet", status); "status %d deflating zlib packet", status);
return NULL; return NULL;
} }
len = BLOCKSIZE - zout->avail_out; len = BLOCKSIZE - zout->avail_out;
if (ssh_buffer_add_data(dest, out_buf, len) < 0) { if (ssh_buffer_add_data(dest, out_buf, len) < 0) {
ssh_buffer_free(dest); SSH_BUFFER_FREE(dest);
return NULL; return NULL;
} }
zout->next_out = out_buf; zout->next_out = out_buf;
@@ -115,16 +115,16 @@ int compress_buffer(ssh_session session, ssh_buffer buf) {
} }
if (ssh_buffer_reinit(buf) < 0) { if (ssh_buffer_reinit(buf) < 0) {
ssh_buffer_free(dest); SSH_BUFFER_FREE(dest);
return -1; return -1;
} }
if (ssh_buffer_add_data(buf, ssh_buffer_get(dest), ssh_buffer_get_len(dest)) < 0) { if (ssh_buffer_add_data(buf, ssh_buffer_get(dest), ssh_buffer_get_len(dest)) < 0) {
ssh_buffer_free(dest); SSH_BUFFER_FREE(dest);
return -1; return -1;
} }
ssh_buffer_free(dest); SSH_BUFFER_FREE(dest);
return 0; return 0;
} }
@@ -189,18 +189,18 @@ static ssh_buffer gzip_decompress(ssh_session session, ssh_buffer source, size_t
if (status != Z_OK && status != Z_BUF_ERROR) { if (status != Z_OK && status != Z_BUF_ERROR) {
ssh_set_error(session, SSH_FATAL, ssh_set_error(session, SSH_FATAL,
"status %d inflating zlib packet", status); "status %d inflating zlib packet", status);
ssh_buffer_free(dest); SSH_BUFFER_FREE(dest);
return NULL; return NULL;
} }
len = BLOCKSIZE - zin->avail_out; len = BLOCKSIZE - zin->avail_out;
if (ssh_buffer_add_data(dest,out_buf,len) < 0) { if (ssh_buffer_add_data(dest,out_buf,len) < 0) {
ssh_buffer_free(dest); SSH_BUFFER_FREE(dest);
return NULL; return NULL;
} }
if (ssh_buffer_get_len(dest) > maxlen){ if (ssh_buffer_get_len(dest) > maxlen){
/* Size of packet exceeded, avoid a denial of service attack */ /* Size of packet exceeded, avoid a denial of service attack */
ssh_buffer_free(dest); SSH_BUFFER_FREE(dest);
return NULL; return NULL;
} }
zin->next_out = out_buf; zin->next_out = out_buf;
@@ -218,15 +218,15 @@ int decompress_buffer(ssh_session session,ssh_buffer buf, size_t maxlen){
} }
if (ssh_buffer_reinit(buf) < 0) { if (ssh_buffer_reinit(buf) < 0) {
ssh_buffer_free(dest); SSH_BUFFER_FREE(dest);
return -1; return -1;
} }
if (ssh_buffer_add_data(buf, ssh_buffer_get(dest), ssh_buffer_get_len(dest)) < 0) { if (ssh_buffer_add_data(buf, ssh_buffer_get(dest), ssh_buffer_get_len(dest)) < 0) {
ssh_buffer_free(dest); SSH_BUFFER_FREE(dest);
return -1; return -1;
} }
ssh_buffer_free(dest); SSH_BUFFER_FREE(dest);
return 0; return 0;
} }