From: Kay Sievers <kay.sievers@suse.de>
Date: Sun, 20 Aug 2006 16:15:29 +0000 (+0200)
Subject: skip rule, if too may keys of the same type are used
X-Git-Tag: 174~2185
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=38895e573c6f17014393dc35a9e53d5f016172c3;hp=95776dc6ec174f47fa4dd4d8abf5d457223e5dd4

skip rule, if too may keys of the same type are used
---

diff --git a/test/udev-test.pl b/test/udev-test.pl
index c1c5302ca..c7662326e 100755
--- a/test/udev-test.pl
+++ b/test/udev-test.pl
@@ -79,7 +79,7 @@ EOF
 		devpath		=> "/block/sda/sda1",
 		exp_name	=> "boot_disk1" ,
 		rules		=> <<EOF
-BUS=="scsi", SYSFS{vendor}=="IBM-ESXS", SYSFS{model}=="ST336605LW    !#", SYSFS{scsi_level}=="4", SYSFS{rev}=="B245", SYSFS{type}=="2", SYSFS{queue_depth}=="32", NAME="boot_diskXX%n"
+BUS=="scsi", SYSFS{vendor}=="IBM-ESXS", SYSFS{model}=="ST336605LW    !#", SYSFS{scsi_level}=="4", SYSFS{rev}=="B245", SYSFS{type}=="0", SYSFS{queue_depth}=="32", NAME="boot_diskXX%n"
 BUS=="scsi", SYSFS{vendor}=="IBM-ESXS", SYSFS{model}=="ST336605LW    !#", SYSFS{scsi_level}=="4", SYSFS{rev}=="B245", SYSFS{type}=="0", NAME="boot_disk%n"
 EOF
 	},
diff --git a/udev_rules_parse.c b/udev_rules_parse.c
index 5e93e60d4..d527bf4ba 100644
--- a/udev_rules_parse.c
+++ b/udev_rules_parse.c
@@ -329,10 +329,11 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
 			}
 			attr = get_key_attribute(key + sizeof("ATTR")-1);
 			if (attr == NULL) {
-				err("error parsing ATTR attribute in '%s'", line);
-				continue;
+				err("error parsing ATTR attribute");
+				goto invalid;
 			}
-			add_rule_key_pair(rule, &rule->attr, operation, attr, value);
+			if (add_rule_key_pair(rule, &rule->attr, operation, attr, value) != 0)
+				goto invalid;
 			valid = 1;
 			continue;
 		}
@@ -381,10 +382,11 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
 			}
 			attr = get_key_attribute(key + sizeof("ATTRS")-1);
 			if (attr == NULL) {
-				err("error parsing ATTRS attribute in '%s'", line);
-				continue;
+				err("error parsing ATTRS attribute");
+				goto invalid;
 			}
-			add_rule_key_pair(rule, &rule->attrs, operation, attr, value);
+			if (add_rule_key_pair(rule, &rule->attrs, operation, attr, value) != 0)
+				goto invalid;
 			valid = 1;
 			continue;
 		}
@@ -393,9 +395,10 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
 			attr = get_key_attribute(key + sizeof("ENV")-1);
 			if (attr == NULL) {
 				err("error parsing ENV attribute");
-				continue;
+				goto invalid;
 			}
-			add_rule_key_pair(rule, &rule->env, operation, attr, value);
+			if (add_rule_key_pair(rule, &rule->env, operation, attr, value) != 0)
+				goto invalid;
 			valid = 1;
 			continue;
 		}