[git commit] mdev: call index_in_strings on $ACTION only after we checked it for NULL

Denys Vlasenko vda.linux at googlemail.com
Tue Apr 2 12:37:06 UTC 2013


commit: http://git.busybox.net/busybox/commit/?id=d35cbad0efaa57bf7c5280e62825966f7757906a
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 util-linux/mdev.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/util-linux/mdev.c b/util-linux/mdev.c
index 5fe6bbb..1d74136 100644
--- a/util-linux/mdev.c
+++ b/util-linux/mdev.c
@@ -1060,15 +1060,15 @@ int mdev_main(int argc UNUSED_PARAM, char **argv)
 		 * ACTION can be "add", "remove", "change"
 		 * DEVPATH is like "/block/sda" or "/class/input/mice"
 		 */
-		action = getenv("ACTION");
-		op = index_in_strings(keywords, action);
 		env_devname = getenv("DEVNAME"); /* can be NULL */
-		env_devpath = getenv("DEVPATH");
 		G.subsystem = getenv("SUBSYSTEM");
+		action = getenv("ACTION");
+		env_devpath = getenv("DEVPATH");
 		if (!action || !env_devpath /*|| !G.subsystem*/)
 			bb_show_usage();
 		fw = getenv("FIRMWARE");
 		seq = getenv("SEQNUM");
+		op = index_in_strings(keywords, action);
 
 		my_pid = getpid();
 		open_mdev_log(seq, my_pid);


More information about the busybox-cvs mailing list