X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Fphp_pqstm.c;h=af0eb15ea8c9707e69e09b64abaf913835205fa2;hb=19011ee23e5bdb9a46778e190a61e4ce6c765be7;hp=6be580cf0607a24a35c94440250a523e6bfa5265;hpb=a4dced008a651f8850669a527987239c9b87f7d3;p=m6w6%2Fext-pq

diff --git a/src/php_pqstm.c b/src/php_pqstm.c
index 6be580c..af0eb15 100644
--- a/src/php_pqstm.c
+++ b/src/php_pqstm.c
@@ -164,16 +164,23 @@ ZEND_BEGIN_ARG_INFO_EX(ai_pqstm_bind, 0, 0, 2)
 ZEND_END_ARG_INFO();
 static PHP_METHOD(pqstm, bind) {
 	long param_no;
-	zval *param_ref;
+	zval **param_ref;
+	zend_error_handling zeh;
+	STATUS rv;
+
+	zend_replace_error_handling(EH_THROW, exce(EX_INVALID_ARGUMENT), &zeh TSRMLS_CC);
+	rv = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "lZ", &param_no, &param_ref);
+	zend_restore_error_handling(&zeh TSRMLS_CC);
 
-	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "lz", &param_no, &param_ref)) {
+	if (SUCCESS == rv) {
 		php_pqstm_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
 		if (!obj->intern) {
 			throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Statement not initialized");
 		} else {
-			Z_ADDREF_P(param_ref);
-			zend_hash_index_update(&obj->intern->bound, param_no, (void *) &param_ref, sizeof(zval *), NULL);
+			SEPARATE_ZVAL_TO_MAKE_IS_REF(param_ref);
+			Z_ADDREF_PP(param_ref);
+			zend_hash_index_update(&obj->intern->bound, param_no, (void *) param_ref, sizeof(zval *), NULL);
 			zend_hash_sort(&obj->intern->bound, zend_qsort, compare_index, 0 TSRMLS_CC);
 		}
 	}
@@ -244,11 +251,7 @@ static PHP_METHOD(pqstm, execAsync) {
 			} else if (obj->intern->conn->intern->unbuffered && !PQsetSingleRowMode(obj->intern->conn->intern->conn)) {
 				throw_exce(EX_RUNTIME TSRMLS_CC, "Failed to enable unbuffered mode (%s)", PHP_PQerrorMessage(obj->intern->conn->intern->conn));
 			} else {
-				php_pq_callback_dtor(&obj->intern->conn->intern->onevent);
-				if (resolver.fci.size > 0) {
-					obj->intern->conn->intern->onevent = resolver;
-					php_pq_callback_addref(&obj->intern->conn->intern->onevent);
-				}
+				php_pq_callback_recurse(&obj->intern->conn->intern->onevent, &resolver TSRMLS_CC);
 				obj->intern->conn->intern->poller = PQconsumeInput;
 			}
 
@@ -313,11 +316,7 @@ static PHP_METHOD(pqstm, descAsync) {
 		} else if (!PQsendDescribePrepared(obj->intern->conn->intern->conn, obj->intern->name)) {
 			throw_exce(EX_IO TSRMLS_CC, "Failed to describe statement: %s", PHP_PQerrorMessage(obj->intern->conn->intern->conn));
 		} else {
-			php_pq_callback_dtor(&obj->intern->conn->intern->onevent);
-			if (resolver.fci.size > 0) {
-				obj->intern->conn->intern->onevent = resolver;
-				php_pq_callback_addref(&obj->intern->conn->intern->onevent);
-			}
+			php_pq_callback_recurse(&obj->intern->conn->intern->onevent, &resolver TSRMLS_CC);
 			obj->intern->conn->intern->poller = PQconsumeInput;
 			php_pqconn_notify_listeners(obj->intern->conn TSRMLS_CC);
 		}