X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudev-rules.c;h=665ad71e80f3289a1234930e1ab0b06fa4c48503;hp=a6f9220352de5fc6caa1542019ee7da81f487253;hb=6270756cdca967adce6badaf1360d872a0907bf0;hpb=1822e9b033fcd91a7dfd3b0bfd12cfbbd93fc470

diff --git a/udev/udev-rules.c b/udev/udev-rules.c
index a6f922035..665ad71e8 100644
--- a/udev/udev-rules.c
+++ b/udev/udev-rules.c
@@ -1843,7 +1843,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
 	/* loop through token list, match, run actions or forward to next rule */
 	cur = &rules->tokens[0];
 	rule = cur;
-	while (cur != NULL && cur->type != TK_END) {
+	while (1) {
 		unsigned int idx;
 
 		dump_token(rules, cur);
@@ -2319,11 +2319,11 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
 			cur = &rules->tokens[cur->key.rule_goto];
 			continue;
 		case TK_A_LAST_RULE:
+		case TK_END:
 			break;
 
 		case TK_M_PARENTS_MAX:
 		case TK_M_MAX:
-		case TK_END:
 		case TK_UNSET:
 			err(rules->udev, "wrong type %u\n", cur->type);
 			goto nomatch;