Skip to content

Sth mem leak fixes #346

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sth0 wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Sth mem leak fixes #346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a36165b
Moved redundant free call
sth0 Feb 16, 2024
c7ec191
Merge branch 'sth-mem-leak' of https://github.com/sth0/radmind into s…
sth0 Feb 20, 2024
296c707
fixed reference to md_value pointer
sth0 Feb 20, 2024
4e51af2
Again found regressions with memory leaks and double free issues.
sth0 Feb 21, 2024
b732491
Still more necessary free statements and style corrections
sth0 Feb 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions retr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ retr( SNET *sn, char *pathdesc, char *path, char *temppath, mode_t tempmode,

if ( *line != '2' ) {
fprintf( stderr, "%s\n", line );
EVP_MD_CTX_free( mdctx );
return( 1 );
}

Expand Down Expand Up @@ -210,7 +211,6 @@ retr( SNET *sn, char *pathdesc, char *path, char *temppath, mode_t tempmode,
if ( cksum ) {
EVP_DigestFinal( mdctx, md_value, &md_len );
base64_e( md_value, md_len, cksum_b64 );
EVP_MD_CTX_free(mdctx);
if ( strcmp( trancksum, cksum_b64 ) != 0 ) {
fprintf( stderr, "line %d: checksum in transcript does not match "
"checksum from server\n", linenum );
Expand All @@ -226,6 +226,7 @@ retr( SNET *sn, char *pathdesc, char *path, char *temppath, mode_t tempmode,
close( fd );
error1:
unlink( temppath );
EVP_MD_CTX_free(mdctx);
return( returnval );
}

Expand Down Expand Up @@ -554,12 +555,11 @@ retr_applefile( SNET *sn, char *pathdesc, char *path, char *temppath,

if ( cksum ) {
EVP_DigestFinal( mdctx, md_value, &md_len );
base64_e(( char*)&md_value, md_len, cksum_b64 );
EVP_MD_CTX_free(mdctx);
base64_e( ( unsigned char * ) md_value, md_len, cksum_b64 );
if ( strcmp( trancksum, cksum_b64 ) != 0 ) {
fprintf( stderr, "line %d: checksum in transcript does not match "
"checksum from server\n", linenum );
fprintf( stderr, "%s\n", pathdesc );
fprintf( stderr, "%s\n", pathdesc );
returnval = 1;
goto error1;
}
Expand All @@ -574,6 +574,7 @@ retr_applefile( SNET *sn, char *pathdesc, char *path, char *temppath,
close( dfd );
error1:
unlink( temppath );
EVP_MD_CTX_free(mdctx);
return( returnval );
}

Expand Down
17 changes: 9 additions & 8 deletions stor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,7 @@ stor_file( SNET *sn, char *pathdesc, char *path, off_t transize,
if ( snet_write( sn, buf, rr, &tv ) != rr ) {
fprintf( stderr, "stor_file %s failed: %s\n", pathdesc,
strerror( errno ));
EVP_MD_CTX_free( mdctx );
return( -1 );
}
size -= rr;
Expand Down Expand Up @@ -227,6 +228,7 @@ stor_file( SNET *sn, char *pathdesc, char *path, off_t transize,
if ( snet_writef( sn, ".\r\n" ) < 0 ) {
fprintf( stderr, "stor_file %s failed: %s\n", pathdesc,
strerror( errno ));
EVP_MD_CTX_free( mdctx );
return( -1 );
}
if ( verbose ) fputs( "\n>>> .\n", stdout );
Expand All @@ -239,8 +241,7 @@ stor_file( SNET *sn, char *pathdesc, char *path, off_t transize,
/* cksum data sent */
if ( cksum ) {
EVP_DigestFinal( mdctx, md_value, &md_len );
base64_e( md_value, md_len, cksum_b64 );
EVP_MD_CTX_free(mdctx);
base64_e( ( unsigned char * ) md_value, md_len, cksum_b64 );
if ( strcmp( trancksum, cksum_b64 ) != 0 ) {
fprintf( stderr,
"line %d: checksum listed in transcript wrong\n", linenum );
Expand All @@ -249,6 +250,7 @@ stor_file( SNET *sn, char *pathdesc, char *path, off_t transize,
}

if ( !quiet && !showprogress ) printf( "%s: stored\n", path );
EVP_MD_CTX_free( mdctx );
return( 0 );
}

Expand Down Expand Up @@ -305,6 +307,7 @@ stor_applefile( SNET *sn, char *pathdesc, char *path, off_t transize,
if ( snprintf( rsrc_path, MAXPATHLEN, "%s%s",
path, _PATH_RSRCFORKSPEC ) >= MAXPATHLEN ) {
errno = ENAMETOOLONG;
EVP_MD_CTX_free( mdctx );
return( -1 );
}
if (( rfd = open( rsrc_path, O_RDONLY )) < 0 ) {
Expand Down Expand Up @@ -419,6 +422,7 @@ stor_applefile( SNET *sn, char *pathdesc, char *path, off_t transize,
if ( snet_write( sn, buf, rc, &tv ) != rc ) {
fprintf( stderr, "stor_applefile %s failed: %s\n", pathdesc,
strerror( errno ));
EVP_MD_CTX_free( mdctx );
return( -1 );
}
size -= rc;
Expand Down Expand Up @@ -471,19 +475,16 @@ stor_applefile( SNET *sn, char *pathdesc, char *path, off_t transize,
/* cksum data sent */
if ( cksum ) {
EVP_DigestFinal( mdctx, md_value, &md_len );
base64_e( ( char*)&md_value, md_len, cksum_b64 );
base64_e( ( unsigned char * ) md_value, md_len, cksum_b64 );
if ( strcmp( trancksum, cksum_b64 ) != 0 ) {
fprintf( stderr,
"line %d: checksum listed in transcript wrong\n", linenum );
if ( ! force ) {
EVP_MD_CTX_free(mdctx);
exit( 2 );
}
if ( ! force ) exit( 2 );
}
}

EVP_MD_CTX_free( mdctx );
if ( !quiet && !showprogress ) printf( "%s: stored\n", path );
EVP_MD_CTX_free( mdctx );
return( 0 );
}

Expand Down