regfio: Return instead of assert for short blocks

Assertions should only be used when there's absolutely no recovery or to
verify data structure invariants. In this case the supplied registry
hive file may have a malformed block with a size of zero. Such a block
should not terminate the whole program.

Signed-off-by: Michael Hanselmann <public@hansmi.ch>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>

diff --git a/source3/registry/regfio.c b/source3/registry/regfio.c
index 32e166a122304bd1dabf677a514150165a73e31f..60c865d4d2268f1d0b8d5d1640f58d5d2bdcc2ba 100644 (file)
--- a/source3/registry/regfio.c
+++ b/source3/registry/regfio.c
@@ -552,7 +552,8 @@ static REGF_HBIN* read_hbin_block( REGF_FILE *file, off_t offset )
                if ( !prs_uint32( "header", &hbin->ps, 0, &header ) )
                        return NULL;
                
-               SMB_ASSERT( record_size != 0 );
+               if (record_size == 0)
+                       return NULL;
 
                if ( record_size & 0x80000000 ) {
                        /* absolute_value(record_size) */