svn commit: trunk/busybox/modutils

vda at busybox.net vda at busybox.net
Sun Sep 14 20:33:03 UTC 2008


Author: vda
Date: 2008-09-14 13:33:03 -0700 (Sun, 14 Sep 2008)
New Revision: 23398

Log:
modprobe-small: trivial SEGV fix



Modified:
   trunk/busybox/modutils/modprobe-small.c


Changeset:
Modified: trunk/busybox/modutils/modprobe-small.c
===================================================================
--- trunk/busybox/modutils/modprobe-small.c	2008-09-14 19:35:45 UTC (rev 23397)
+++ trunk/busybox/modutils/modprobe-small.c	2008-09-14 20:33:03 UTC (rev 23398)
@@ -600,7 +600,7 @@
 	free(deps);
 
 	/* modprobe -> load it */
-	if (!is_rmmod && !strstr(options, "blacklist")) {
+	if (!is_rmmod && (options && !strstr(options, "blacklist"))) {
 		errno = 0;
 		if (load_module(info->pathname, options) != 0) {
 			if (EEXIST != errno) {




More information about the busybox-cvs mailing list