more tests

Author: ZNeumann

agent/php_internal_instrument.c

@@ -1600,16 +1600,19 @@ NR_INNER_WRAPPER(memcached_add_servers) {
   if (SUCCESS
       == zend_parse_parameters_ex(
           ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(), "a", &servers)) {
-    ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(servers), server) {
-      zval* host = nr_php_zend_hash_index_find(Z_ARRVAL_P(server), 0);
-      zval* port = nr_php_zend_hash_index_find(Z_ARRVAL_P(server), 1);
-      if (NULL != host && NULL != port) {
-        instance = nr_php_memcached_create_datastore_instance(Z_STRVAL_P(host), Z_LVAL_P(port));
-        nr_php_instrument_datastore_operation(NR_DATASTORE_MEMCACHE,
-                                              NULL, instance, true);
+    if (Z_TYPE_P(servers) == IS_ARRAY) {
+      ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(servers), server) {
+        zval* host = nr_php_zend_hash_index_find(Z_ARRVAL_P(server), 0);
+        zval* port = nr_php_zend_hash_index_find(Z_ARRVAL_P(server), 1);
+        if (NULL != host && NULL != port &&
+            Z_TYPE_P(host) == IS_STRING && Z_TYPE_P(port) == IS_LONG) {
+          instance = nr_php_memcached_create_datastore_instance(Z_STRVAL_P(host), Z_LVAL_P(port));
+          nr_php_instrument_datastore_operation(NR_DATASTORE_MEMCACHE,
+                                                NULL, instance, true);
+        }
       }
+      ZEND_HASH_FOREACH_END();
     }
-    ZEND_HASH_FOREACH_END();
   }
   zcaught = nr_zend_call_old_handler(nr_wrapper->oldhandler,
                                      INTERNAL_FUNCTION_PARAM_PASSTHRU);

tests/integration/memcached/test_add_servers.php

@@ -20,6 +20,7 @@
 Datastore/instance/Memcached/host1/1
 Datastore/instance/Memcached/host2/2
 Datastore/instance/Memcached/host3/11211
+Datastore/instance/Memcached/host4/1
 */
 
 require_once(realpath (dirname ( __FILE__ )) . '/../../include/helpers.php');
@@ -32,4 +33,8 @@
                        array("host2", 2),
                        array("host3", 11211)));
 $memcached->addServers(array());
+$memcached->addServers(array(array("host4", 1, "test field")));
+$memcached->addServers(array(array(1)));
+$memcached->addServers(array(array("host1")));
+$memcached->addServers(array(array(1, "host1")));
 $memcached->quit();