summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2008-02-18 20:37:33 +1100
committerJeremy Allison <jra@samba.org>2008-02-20 18:28:41 -0800
commit34eef81d2ab05e576401da1f80a264f1fd193f36 (patch)
tree590aba4d46ba8032372e429f046a6f395731eb2a
parent441de75e58daf734c412a3e741608822289cac59 (diff)
downloadsamba-34eef81d2ab05e576401da1f80a264f1fd193f36.tar.gz
samba-34eef81d2ab05e576401da1f80a264f1fd193f36.tar.bz2
samba-34eef81d2ab05e576401da1f80a264f1fd193f36.zip
Fix double free bugs after calling regfio_close()
(This used to be commit 737bb950d50ac6c5d4f99279bf535ae3a9963b2f)
-rw-r--r--source3/registry/regfio.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/source3/registry/regfio.c b/source3/registry/regfio.c
index 3740ff0ee4..1c3aad7a25 100644
--- a/source3/registry/regfio.c
+++ b/source3/registry/regfio.c
@@ -1171,7 +1171,6 @@ out:
if ( !(rb->mem_ctx = talloc_init( "read_regf_block" )) ) {
regfio_close( rb );
- SAFE_FREE(rb);
return NULL;
}
@@ -1182,7 +1181,6 @@ out:
if ( (rb->fd = open(filename, flags, mode)) == -1 ) {
DEBUG(0,("regfio_open: failure to open %s (%s)\n", filename, strerror(errno)));
regfio_close( rb );
- SAFE_FREE(rb);
return NULL;
}
@@ -1192,7 +1190,6 @@ out:
if ( !init_regf_block( rb ) ) {
DEBUG(0,("regfio_open: Failed to read initial REGF block\n"));
regfio_close( rb );
- SAFE_FREE(rb);
return NULL;
}
@@ -1205,7 +1202,6 @@ out:
if ( !read_regf_block( rb ) ) {
DEBUG(0,("regfio_open: Failed to read initial REGF block\n"));
regfio_close( rb );
- SAFE_FREE(rb);
return NULL;
}