Fix for previously fixed bug :)

Author: bigbes

src/php_tarantool.h

@@ -57,6 +57,7 @@ PHP_MINFO_FUNCTION(tarantool);
 
 PHP_METHOD(tarantool_class, __construct);
 PHP_METHOD(tarantool_class, connect);
+PHP_METHOD(tarantool_class, reconnect);
 PHP_METHOD(tarantool_class, close);
 PHP_METHOD(tarantool_class, authenticate);
 PHP_METHOD(tarantool_class, ping);

src/tarantool.c

@@ -41,9 +41,10 @@ ZEND_DECLARE_MODULE_GLOBALS(tarantool)
 			zend_object_store_get_object(ID TSRMLS_CC)
 
 #define TARANTOOL_CONNECT_ON_DEMAND(CON, ID)				\
-	if (!CON->stream)						\
+	if (!CON->stream) {						\
 		if (__tarantool_connect(CON, ID TSRMLS_CC) == FAILURE)	\
 			RETURN_FALSE;					\
+	}								\
 	if (CON->stream && php_stream_eof(CON->stream) != 0)		\
 		if (__tarantool_reconnect(CON, ID TSRMLS_CC) == FAILURE)\
 			RETURN_FALSE;
@@ -183,6 +184,7 @@ int __tarantool_connect(tarantool_object *obj, zval *id TSRMLS_DC) {
 		char errstr[256];
 		snprintf(errstr, 256, "%s", err);
 		THROW_EXC(errstr);
+		efree(err);
 		return FAILURE;
 	}
 	if (obj->login != NULL && obj->passwd != NULL) {
@@ -256,11 +258,11 @@ static int64_t tarantool_step_recv(
 	*body = NULL;
 	if (tarantool_stream_read(obj, pack_len, 5) != 5) {
 		THROW_EXC("Can't read query from server");
-		goto error;
+		goto error_con;
 	}
 	if (php_mp_check(pack_len, 5)) {
 		THROW_EXC("Failed verifying msgpack");
-		goto error;
+		goto error_con;
 	}
 	size_t body_size = php_mp_unpack_package_size(pack_len);
 	smart_string_ensure(obj->value, body_size);
@@ -283,7 +285,7 @@ static int64_t tarantool_step_recv(
 	}
 	if (php_mp_check(pos, body_size)) {
 		THROW_EXC("Failed verifying msgpack");
-		goto error;
+		goto error_con;
 	}
 	if (php_mp_unpack(body, &pos) == FAILURE) {
 		*body = NULL;
@@ -298,7 +300,7 @@ static int64_t tarantool_step_recv(
 			THROW_EXC("request sync is not equal response sync. "
 				  "closing connection");
 			tarantool_stream_close(obj);
-			goto error;
+			goto error_con;
 		}
 	}
 	val = NULL;
@@ -320,8 +322,9 @@ static int64_t tarantool_step_recv(
 		goto error;
 	}
 	THROW_EXC("Failed to retrieve answer code");
-error:
+error_con:
 	obj->stream = NULL;
+error:
 	if (*header) zval_ptr_dtor(header);
 	if (*body) zval_ptr_dtor(body);
 	SSTR_LEN(obj->value) = 0;
@@ -333,6 +336,7 @@ static int64_t tarantool_step_recv(
 const zend_function_entry tarantool_class_methods[] = {
 	PHP_ME(tarantool_class, __construct, NULL, ZEND_ACC_PUBLIC)
 	PHP_ME(tarantool_class, connect, NULL, ZEND_ACC_PUBLIC)
+	PHP_ME(tarantool_class, reconnect, NULL, ZEND_ACC_PUBLIC)
 	PHP_ME(tarantool_class, close, NULL, ZEND_ACC_PUBLIC)
 	PHP_ME(tarantool_class, flush_schema, NULL, ZEND_ACC_PUBLIC)
 	PHP_ME(tarantool_class, authenticate, NULL, ZEND_ACC_PUBLIC)
@@ -382,41 +386,40 @@ zval *tarantool_update_verify_op(zval *op, long position TSRMLS_DC) {
 			Z_STRLEN_PP(opstr) != 1) {
 		THROW_EXC("Field OP must be provided and must be STRING with "
 				"length=1 at position %d", position);
-		return NULL;
+		goto cleanup;
 	}
 	if (zend_hash_find(ht, "field", 6, (void **)&oppos) == FAILURE ||
 			!oppos || Z_TYPE_PP(oppos) != IS_LONG) {
 		THROW_EXC("Field FIELD must be provided and must be LONG at "
 				"position %d", position);
-		return NULL;
-
+		goto cleanup;
 	}
 	zval **oparg, **splice_len, **splice_val;
 	switch(Z_STRVAL_PP(opstr)[0]) {
 	case ':':
 		if (n != 5) {
 			THROW_EXC("Five fields must be provided for splice"
 					" at position %d", position);
-			return NULL;
+			goto cleanup;
 		}
 		if (zend_hash_find(ht, "offset", 7,
 				(void **)&oparg) == FAILURE ||
 				!oparg || Z_TYPE_PP(oparg) != IS_LONG) {
 			THROW_EXC("Field OFFSET must be provided and must be LONG for "
 					"splice at position %d", position);
-			return NULL;
+			goto cleanup;
 		}
 		if (zend_hash_find(ht, "length", 7, (void **)&splice_len) == FAILURE ||
 				!oparg || Z_TYPE_PP(splice_len) != IS_LONG) {
 			THROW_EXC("Field LENGTH must be provided and must be LONG for "
 					"splice at position %d", position);
-			return NULL;
+			goto cleanup;
 		}
 		if (zend_hash_find(ht, "list", 5, (void **)&splice_val) == FAILURE ||
 				!oparg || Z_TYPE_PP(splice_val) != IS_STRING) {
 			THROW_EXC("Field LIST must be provided and must be STRING for "
 					"splice at position %d", position);
-			return NULL;
+			goto cleanup;
 		}
 		add_next_index_stringl(arr, Z_STRVAL_PP(opstr), 1, 1);
 		add_next_index_long(arr, Z_LVAL_PP(oppos));
@@ -434,13 +437,13 @@ zval *tarantool_update_verify_op(zval *op, long position TSRMLS_DC) {
 		if (n != 3) {
 			THROW_EXC("Three fields must be provided for '%s' at "
 					"position %d", Z_STRVAL_PP(opstr), position);
-			return NULL;
+			goto cleanup;
 		}
 		if (zend_hash_find(ht, "arg", 4, (void **)&oparg) == FAILURE ||
 				!oparg || Z_TYPE_PP(oparg) != IS_LONG) {
 			THROW_EXC("Field ARG must be provided and must be LONG for "
 					"'%s' at position %d", Z_STRVAL_PP(opstr), position);
-			return NULL;
+			goto cleanup;
 		}
 		add_next_index_stringl(arr, Z_STRVAL_PP(opstr), 1, 1);
 		add_next_index_long(arr, Z_LVAL_PP(oppos));
@@ -451,13 +454,13 @@ zval *tarantool_update_verify_op(zval *op, long position TSRMLS_DC) {
 		if (n != 3) {
 			THROW_EXC("Three fields must be provided for '%s' at "
 					"position %d", Z_STRVAL_PP(opstr), position);
-			return NULL;
+			goto cleanup;
 		}
 		if (zend_hash_find(ht, "arg", 4, (void **)&oparg) == FAILURE ||
 				!oparg || !PHP_MP_SERIALIZABLE_PP(oparg)) {
 			THROW_EXC("Field ARG must be provided and must be SERIALIZABLE for "
 					"'%s' at position %d", Z_STRVAL_PP(opstr), position);
-			return NULL;
+			goto cleanup;
 		}
 		add_next_index_stringl(arr, Z_STRVAL_PP(opstr), 1, 1);
 		add_next_index_long(arr, Z_LVAL_PP(oppos));
@@ -467,10 +470,12 @@ zval *tarantool_update_verify_op(zval *op, long position TSRMLS_DC) {
 	default:
 		THROW_EXC("Unknown operation '%s' at position %d",
 				Z_STRVAL_PP(opstr), position);
-		return NULL;
-
+		goto cleanup;
 	}
 	return arr;
+cleanup:
+	zval_ptr_dtor(&arr);
+	return NULL;
 }
 
 zval *tarantool_update_verify_args(zval *args TSRMLS_DC) {
@@ -497,11 +502,14 @@ zval *tarantool_update_verify_args(zval *args TSRMLS_DC) {
 			goto cleanup;
 		if (add_next_index_zval(arr, op_arr) == FAILURE) {
 			THROW_EXC("Internal Array Error");
+			if (op_arr)
+				zval_ptr_dtor(&op_arr);
 			goto cleanup;
 		}
 	}
 	return arr;
 cleanup:
+	zval_ptr_dtor(&arr);
 	return NULL;
 }
 
@@ -732,6 +740,14 @@ PHP_METHOD(tarantool_class, connect) {
 	RETURN_TRUE;
 }
 
+PHP_METHOD(tarantool_class, reconnect) {
+	TARANTOOL_PARSE_PARAMS(id, "", id);
+	TARANTOOL_FETCH_OBJECT(obj, id);
+	if (__tarantool_reconnect(obj, id TSRMLS_CC) == FAILURE)
+		RETURN_FALSE;
+	RETURN_TRUE;
+}
+
 int __tarantool_authenticate(tarantool_object *obj) {
 	TSRMLS_FETCH();