svn commit: trunk/busybox/modutils

landley at busybox.net landley at busybox.net
Fri Dec 16 06:18:06 UTC 2005


Author: landley
Date: 2005-12-15 22:18:06 -0800 (Thu, 15 Dec 2005)
New Revision: 12922

Log:
I screwed up the last commit: if dt is null when ENABLE_MULTIPLE_OPTIONS is
off, we'd dereference the null.  Oops.


Modified:
   trunk/busybox/modutils/modprobe.c


Changeset:
Modified: trunk/busybox/modutils/modprobe.c
===================================================================
--- trunk/busybox/modutils/modprobe.c	2005-12-16 06:12:46 UTC (rev 12921)
+++ trunk/busybox/modutils/modprobe.c	2005-12-16 06:18:06 UTC (rev 12922)
@@ -497,13 +497,15 @@
 						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 );
 					}
 				}
 			}




More information about the busybox-cvs mailing list