---

yaml --- r: 221602 b: refs/heads/master c: 5ec1cea h: refs/heads/master v: v3
git-mirror · Oct 31, 2010 · a30681c · a30681c
1 parent f67c589
commit a30681c
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: 636f8c6f682ee179ff39c94dc4d0be0ddd6c8cdd
+refs/heads/master: 5ec1cea057495b8f10bab0c1396a9d8e46b7b0a8
diff --git a/trunk/net/sched/em_text.c b/trunk/net/sched/em_text.c
@@ -103,7 +103,8 @@ static int em_text_change(struct tcf_proto *tp, void *data, int len,
 
 static void em_text_destroy(struct tcf_proto *tp, struct tcf_ematch *m)
 {
-	textsearch_destroy(EM_TEXT_PRIV(m)->config);
+	if (EM_TEXT_PRIV(m) && EM_TEXT_PRIV(m)->config)
+		textsearch_destroy(EM_TEXT_PRIV(m)->config);
 }
 
 static int em_text_dump(struct sk_buff *skb, struct tcf_ematch *m)