ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

setupapi: Refactor freeing the INF file into free_inf_file. Use this new function to free any remnants of the parsing on error.

This commit is contained in:
James Hawkins 2010-01-06 18:26:52 -08:00 committed by Alexandre Julliard
parent 5324cb6135
commit b116175d4a
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
dlls/setupapi/parser.c
View File

@ -856,6 +856,19 @@ static const WCHAR *comment_state( struct parser *parser, const WCHAR *pos )
}
static void free_inf_file( struct inf_file *file )
{
unsigned int i;
for (i = 0; i < file->nb_sections; i++) HeapFree( GetProcessHeap(), 0, file->sections[i] );
HeapFree( GetProcessHeap(), 0, file->filename );
HeapFree( GetProcessHeap(), 0, file->sections );
HeapFree( GetProcessHeap(), 0, file->fields );
HeapFree( GetProcessHeap(), 0, file->strings );
HeapFree( GetProcessHeap(), 0, file );
}
/* parse a complete buffer */
static DWORD parse_buffer( struct inf_file *file, const WCHAR *buffer, const WCHAR *end,
UINT *error_line )
@ -1011,7 +1024,7 @@ static struct inf_file *parse_file( HANDLE handle, const WCHAR *class, DWORD sty
UnmapViewOfFile( buffer );
if (err)
{
HeapFree( GetProcessHeap(), 0, file );
free_inf_file( file );
SetLastError( err );
file = NULL;
}
@ -1231,16 +1244,10 @@ HINF WINAPI SetupOpenMasterInf( VOID )
void WINAPI SetupCloseInfFile( HINF hinf )
{
struct inf_file *file = hinf;
unsigned int i;
if (!hinf || (hinf == INVALID_HANDLE_VALUE)) return;
for (i = 0; i < file->nb_sections; i++) HeapFree( GetProcessHeap(), 0, file->sections[i] );
HeapFree( GetProcessHeap(), 0, file->filename );
HeapFree( GetProcessHeap(), 0, file->sections );
HeapFree( GetProcessHeap(), 0, file->fields );
HeapFree( GetProcessHeap(), 0, file->strings );
HeapFree( GetProcessHeap(), 0, file );
free_inf_file( file );
}