---

yaml --- r: 167790 b: refs/heads/master c: 2bc8720 h: refs/heads/master v: v3
git-mirror · Oct 14, 2009 · 27c4d53 · 27c4d53
1 parent 07a8403
commit 27c4d53
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d58e6576b0deec6f0b9ff8450fe282da18c50883
+refs/heads/master: 2bc872036e1c5948b5b02942810bbdd8dbdb9812
diff --git a/trunk/kernel/futex.c b/trunk/kernel/futex.c
@@ -150,7 +150,8 @@ static struct futex_hash_bucket *hash_futex(union futex_key *key)
  */
 static inline int match_futex(union futex_key *key1, union futex_key *key2)
 {
-	return (key1->both.word == key2->both.word
+	return (key1 && key2
+		&& key1->both.word == key2->both.word
 		&& key1->both.ptr == key2->both.ptr
 		&& key1->both.offset == key2->both.offset);
 }