Merge github.com:grpc/grpc into secsvr

4 files changed, 108 insertions, 2 deletions

diff --git a/test/core/bad_client/tests/initial_settings_frame.c b/test/core/bad_client/tests/initial_settings_frame.c
index 6ed15bbed1..129c667f71 100644
--- a/test/core/bad_client/tests/initial_settings_frame.c
+++ b/test/core/bad_client/tests/initial_settings_frame.c
@@ -94,7 +94,15 @@ int main(int argc, char **argv) {
   /* some settings values are illegal */
   /* max frame size = 0 */
   GRPC_RUN_BAD_CLIENT_TEST(verifier,
-                           PFX_STR ONE_SETTING_HDR "\x00\x05\x00\x00\x00\x00", GRPC_BAD_CLIENT_DISCONNECT);
+                           PFX_STR ONE_SETTING_HDR "\x00\x05\x00\x00\x00\x00", 
+                           GRPC_BAD_CLIENT_DISCONNECT);
+  GRPC_RUN_BAD_CLIENT_TEST(verifier,
+                           PFX_STR ONE_SETTING_HDR "\x00\x06\xff\xff\xff\xff", 
+                           GRPC_BAD_CLIENT_DISCONNECT);
+  /* update intiial window size */
+  GRPC_RUN_BAD_CLIENT_TEST(verifier,
+                           PFX_STR ONE_SETTING_HDR "\x00\x04\x00\x01\x00\x00", 
+                           GRPC_BAD_CLIENT_DISCONNECT);
 
   return 0;
 }
diff --git a/test/core/client_config/lb_policies_test.c b/test/core/client_config/lb_policies_test.c
index 5aa8140e08..175ebb6375 100644
--- a/test/core/client_config/lb_policies_test.c
+++ b/test/core/client_config/lb_policies_test.c
@@ -42,8 +42,9 @@
 #include <grpc/support/string_util.h>
 
 #include "src/core/channel/channel_stack.h"
-#include "src/core/surface/channel.h"
 #include "src/core/channel/client_channel.h"
+#include "src/core/client_config/lb_policy_registry.h"
+#include "src/core/surface/channel.h"
 #include "src/core/support/string.h"
 #include "src/core/surface/server.h"
 #include "test/core/util/test_config.h"
@@ -716,6 +717,9 @@ int main(int argc, char **argv) {
   grpc_test_init(argc, argv);
   grpc_init();
 
+  GPR_ASSERT(grpc_lb_policy_create("this-lb-policy-does-not-exist", NULL) == NULL);
+  GPR_ASSERT(grpc_lb_policy_create(NULL, NULL) == NULL);
+
   /* everything is fine, all servers stay up the whole time and life's peachy */
   spec = test_spec_create(NUM_ITERS, NUM_SERVERS);
   spec->verifier = verify_vanilla_round_robin;
diff --git a/test/core/support/alloc_test.c b/test/core/support/alloc_test.c
new file mode 100644
index 0000000000..289b2b0c87
--- /dev/null
+++ b/test/core/support/alloc_test.c
@@ -0,0 +1,74 @@
+/*
+ *
+ * Copyright 2015, Google Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include <grpc/support/log.h>
+#include <grpc/support/alloc.h>
+#include "test/core/util/test_config.h"
+
+static void *fake_malloc(size_t size) {
+  return (void*)size;
+}
+
+static void *fake_realloc(void *addr, size_t size) {
+  return (void*)size;
+}
+
+static void fake_free(void *addr) {
+  *((gpr_intptr*)addr) = 0xdeadd00d;
+}
+
+static void test_custom_allocs() {
+  const gpr_allocation_functions default_fns = gpr_get_allocation_functions();
+  gpr_intptr addr_to_free = 0;
+  int *i;
+  gpr_allocation_functions fns = {fake_malloc, fake_realloc, fake_free};
+
+  gpr_set_allocation_functions(fns);
+  GPR_ASSERT((void*)0xdeadbeef == gpr_malloc(0xdeadbeef));
+  GPR_ASSERT((void*)0xcafed00d == gpr_realloc(0, 0xcafed00d));
+
+  gpr_free(&addr_to_free);
+  GPR_ASSERT(addr_to_free == 0xdeadd00d);
+
+  /* Restore and check we don't get funky values and that we don't leak */
+  gpr_set_allocation_functions(default_fns);
+  GPR_ASSERT((void*)1 != (i = gpr_malloc(sizeof(*i))));
+  GPR_ASSERT((void*)2 != (i = gpr_realloc(i, 2)));
+  gpr_free(i);
+}
+
+int main(int argc, char **argv) {
+  grpc_test_init(argc, argv);
+  test_custom_allocs();
+  return 0;
+}
diff --git a/test/core/transport/metadata_test.c b/test/core/transport/metadata_test.c
index 9c1eae9552..928fba7f45 100644
--- a/test/core/transport/metadata_test.c
+++ b/test/core/transport/metadata_test.c
@@ -241,6 +241,25 @@ static void test_base64_and_huffman_works(void) {
   grpc_shutdown();
 }
 
+static void test_user_data_works(void) {
+  int *ud1;
+  int *ud2;
+  grpc_mdelem *md;
+  LOG_TEST("test_user_data_works");
+
+  grpc_init();
+  ud1 = gpr_malloc(sizeof(int));
+  *ud1 = 1;
+  ud2 = gpr_malloc(sizeof(int));
+  *ud2 = 2;
+  md = grpc_mdelem_from_strings("abc", "123");
+  grpc_mdelem_set_user_data(md, gpr_free, ud1);
+  grpc_mdelem_set_user_data(md, gpr_free, ud2);
+  GPR_ASSERT(grpc_mdelem_get_user_data(md, gpr_free) == ud1);
+  GRPC_MDELEM_UNREF(md);
+  grpc_shutdown();
+}
+
 int main(int argc, char **argv) {
   grpc_test_init(argc, argv);
   test_no_op();
@@ -252,5 +271,6 @@ int main(int argc, char **argv) {
   test_things_stick_around();
   test_slices_work();
   test_base64_and_huffman_works();
+  test_user_data_works();
   return 0;
 }