Merge pull request naver#243 from uhm0311/uhm0311/proxy_connect_valid…

…ation INTERNAL: Add validation in arcus_proxy_connect()
uhm0311 · Mar 16, 2022 · 2e797b3 · 2e797b3
2 parents 222d6cf + 764f29e
commit 2e797b3
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/libmemcached/arcus.cc b/libmemcached/arcus.cc
@@ -405,10 +405,21 @@ arcus_return_t arcus_proxy_connect(memcached_st *mc,
                                    memcached_pool_st *pool,
                                    memcached_st *proxy)
 {
-  arcus_return_t rc;
+  if (mc == NULL and pool == NULL) {
+    return ARCUS_ERROR;
+  }
+  if (proxy == NULL) {
+    return ARCUS_ERROR;
+  }
+  if (mc != NULL and pool != NULL and mc != memcached_pool_get_master(pool)) {
+    return ARCUS_ERROR;
+  }
+  if (mc == NULL and pool != NULL) {
+    mc= memcached_pool_get_master(pool);
+  }
 
   /* Initiate the Arcus. */
-  rc= do_arcus_init(mc, pool, NULL, NULL);
+  arcus_return_t rc= do_arcus_init(mc, pool, NULL, NULL);
   if (rc == ARCUS_ALREADY_INITIATED) {
     return ARCUS_SUCCESS;
   }