Check for server key length.

Andrei Zmievski · RJ · commit 53d99a8ee4ce · 2009-02-09T18:47:56.000+08:00
Signed-off-by: Richard Jones &lt;rj@metabrew.com&gt;
diff --git a/php_memcached.c b/php_memcached.c
@@ -19,6 +19,7 @@
 /* TODO
  * - set LIBKETAMA_COMPATIBLE as the default?
  * - add payload flag for IS_BOOL?
+ * - add getVersion()
  */
 
 #ifdef HAVE_CONFIG_H
@@ -1383,6 +1384,7 @@ PHP_METHOD(Memcached, addServers)
 			}
 		}
 
+		/* catch-all for all errors */
 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "could not add entry #%d to the server list", i+1);
 	}
 
@@ -1443,6 +1445,11 @@ PHP_METHOD(Memcached, getServerByKey)
 		return;
 	}
 
+	if (server_key_len == 0) {
+		MEMC_G(rescode) = MEMCACHED_BAD_KEY_PROVIDED;
+		RETURN_FALSE;
+	}
+
 	MEMC_METHOD_FETCH_OBJECT;
 	MEMC_G(rescode) = MEMCACHED_SUCCESS;
 

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@`
`19`	`19`	`/* TODO`
`20`	`20`	`* - set LIBKETAMA_COMPATIBLE as the default?`
`21`	`21`	`* - add payload flag for IS_BOOL?`
	`22`	`+ * - add getVersion()`
`22`	`23`	`*/`
`23`	`24`
`24`	`25`	`#ifdef HAVE_CONFIG_H`
`@@ -1383,6 +1384,7 @@ PHP_METHOD(Memcached, addServers)`
`1383`	`1384`	`}`
`1384`	`1385`	`}`
`1385`	`1386`
	`1387`	`+ /* catch-all for all errors */`
`1386`	`1388`	`php_error_docref(NULL TSRMLS_CC, E_WARNING, "could not add entry #%d to the server list", i+1);`
`1387`	`1389`	`}`
`1388`	`1390`
`@@ -1443,6 +1445,11 @@ PHP_METHOD(Memcached, getServerByKey)`
`1443`	`1445`	`return;`
`1444`	`1446`	`}`
`1445`	`1447`
	`1448`	`+ if (server_key_len == 0) {`
	`1449`	`+ MEMC_G(rescode) = MEMCACHED_BAD_KEY_PROVIDED;`
	`1450`	`+ RETURN_FALSE;`
	`1451`	`+ }`
	`1452`	`+`
`1446`	`1453`	`MEMC_METHOD_FETCH_OBJECT;`
`1447`	`1454`	`MEMC_G(rescode) = MEMCACHED_SUCCESS;`
`1448`	`1455`