X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_rules_parse.c;h=638ea159fbdf71e15f9a65b9cd6efb84a894a39b;hp=c4fa142b04a21c078db43607acf7c178d68472c9;hb=274da2b23d37f2dd174f765e9cfcc485e4a5a898;hpb=fb819f5554530dd136d50aa40438e9dbeeceac01

diff --git a/udev_rules_parse.c b/udev_rules_parse.c
index c4fa142b0..638ea159f 100644
--- a/udev_rules_parse.c
+++ b/udev_rules_parse.c
@@ -425,13 +425,13 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
 
 		if (strncasecmp(key, "IMPORT", sizeof("IMPORT")-1) == 0) {
 			attr = get_key_attribute(key + sizeof("IMPORT")-1);
-			if (attr && strstr(attr, "program")) {
+			if (attr != NULL && strstr(attr, "program")) {
 				dbg("IMPORT will be executed");
 				rule->import_type  = IMPORT_PROGRAM;
-			} else if (attr && strstr(attr, "file")) {
+			} else if (attr != NULL && strstr(attr, "file")) {
 				dbg("IMPORT will be included as file");
 				rule->import_type  = IMPORT_FILE;
-			} else if (attr && strstr(attr, "parent")) {
+			} else if (attr != NULL && strstr(attr, "parent")) {
 				dbg("IMPORT will include the parent values");
 				rule->import_type = IMPORT_PARENT;
 			} else {
@@ -479,8 +479,10 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
 
 		if (strncasecmp(key, "RUN", sizeof("RUN")-1) == 0) {
 			attr = get_key_attribute(key + sizeof("RUN")-1);
-			if (attr && strstr(attr, "ignore_error"))
-				rule->run_ignore_error = 1;
+			if (attr != NULL) {
+				if (strstr(attr, "ignore_error"))
+					rule->run_ignore_error = 1;
+			}
 			add_rule_key(rule, &rule->run, operation, value);
 			valid = 1;
 			continue;