emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

I screwed up the last commit: if dt is null when ENABLE_MULTIPLE_OPTIONS is

Browse Source 
off, we'd dereference the null.  Oops.
This commit is contained in:
Rob Landley 2005-12-16 06:18:06 +00:00
parent a930bd3332
commit 199501f2a0
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modutils/modprobe.c
View File

@ -497,13 +497,15 @@ static struct dep_t *build_dep ( void )
if ( strcmp ( dt-> m_name, mod ) == 0 )
break;
}
if ( ENABLE_FEATURE_MODPROBE_MULTIPLE_OPTIONS && dt ) {
char* new_opt = NULL;
while( ( opt = parse_command_string( opt, &new_opt ) ) ) {
dt-> m_options = append_option( dt-> m_options, new_opt );
if ( dt ) {
if ( ENABLE_FEATURE_MODPROBE_MULTIPLE_OPTIONS ) {
char* new_opt = NULL;
while( ( opt = parse_command_string( opt, &new_opt ) ) ) {
dt-> m_options = append_option( dt-> m_options, new_opt );
}
} else {
dt-> m_options = append_option( dt-> m_options, opt );
}
} else {
dt-> m_options = append_option( dt-> m_options, opt );
}
}
}