From: Willy Tarreau <w@1wt.eu>
Date: Sun, 2 Jan 2011 18:31:23 +0000 (+0100)
Subject: [BUG] stick-table: correctly terminate string keys during lookups
X-Git-Tag: v1.5-dev8~334
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=035da6d1b0c436b85add48bc22120aa814c9cab9;p=thirdparty%2Fhaproxy.git

[BUG] stick-table: correctly terminate string keys during lookups

If a key to be looked up is extracted from data without being padded
and if it matches the beginning of another stored key, it is not
found in subsequent lookups because it does not end with a zero.

This bug was discovered and diagnosed by David Cournapeau.
---

diff --git a/src/stick_table.c b/src/stick_table.c
index 7c9ad8da0d..40b2bff07e 100644
--- a/src/stick_table.c
+++ b/src/stick_table.c
@@ -560,7 +560,13 @@ struct stktable_key *stktable_fetch_key(struct stktable *t, struct proxy *px, st
 	if (!static_table_key.key)
 		return NULL;
 
-	if ((static_table_key.key_len < t->key_size) && (t->type != STKTABLE_TYPE_STRING)) {
+	if (t->type == STKTABLE_TYPE_STRING) {
+		/* The string MUST be terminated by a '\0' after the key_len bytes */
+		if (static_table_key.key_len > t->key_size - 1)
+			static_table_key.key_len = t->key_size - 1;
+		((char *)static_table_key.key)[static_table_key.key_len] = 0;
+	}
+	else if (static_table_key.key_len < t->key_size) {
 		/* need padding with null */
 
 		/* assume static_table_key.key_len is less than sizeof(static_table_key.data.buf)