Fix arnaud-lb#74

sFreezer · Dec 18, 2016 · fac6817 · fac6817
1 parent 7bdf772
commit fac6817
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 5 deletions.
diff --git a/kafka_consumer.c b/kafka_consumer.c
@@ -411,7 +411,7 @@ static void consumer_commit(int async, INTERNAL_FUNCTION_PARAMETERS) /* {{{ */
     rd_kafka_topic_partition_list_t *offsets = NULL;
     rd_kafka_resp_err_t err;
 
-    if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|z", &zarg) == FAILURE) {
+    if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|z!", &zarg) == FAILURE) {
         return;
     }
 

diff --git a/rdkafka.c b/rdkafka.c
@@ -251,7 +251,7 @@ PHP_METHOD(RdKafka__Consumer, __construct)
 
     zend_replace_error_handling(EH_THROW, spl_ce_InvalidArgumentException, &error_handling TSRMLS_CC);
 
-    if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|O", &zconf, ce_kafka_conf) == FAILURE) {
+    if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|O!", &zconf, ce_kafka_conf) == FAILURE) {
         zend_restore_error_handling(&error_handling TSRMLS_CC);
         return;
     }
@@ -423,7 +423,7 @@ PHP_METHOD(RdKafka__Kafka, newTopic)
     rd_kafka_topic_conf_t *conf = NULL;
     kafka_conf_object *conf_intern;
 
-    if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|O", &topic, &topic_len, &zconf, ce_kafka_topic_conf) == FAILURE) {
+    if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|O!", &topic, &topic_len, &zconf, ce_kafka_topic_conf) == FAILURE) {
         return;
     }
 
@@ -591,7 +591,7 @@ PHP_METHOD(RdKafka__Producer, __construct)
 
     zend_replace_error_handling(EH_THROW, spl_ce_InvalidArgumentException, &error_handling TSRMLS_CC);
 
-    if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|O", &zconf, ce_kafka_conf) == FAILURE) {
+    if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|O!", &zconf, ce_kafka_conf) == FAILURE) {
         zend_restore_error_handling(&error_handling TSRMLS_CC);
         return;
     }

diff --git a/tests/bug74.phpt b/tests/bug74.phpt
@@ -0,0 +1,14 @@
+--TEST--
+Bug 74
+--FILE--
+<?php
+
+$consumer = new RdKafka\Consumer(null);
+$topic = $consumer->newTopic("batman", null);
+
+$producer = new RdKafka\Producer(null);
+
+if (class_exists('RdKafka\TopicPartition')) {
+    $tp = new RdKafka\TopicPartition("batman", 0, null);
+}
+--EXPECT--
diff --git a/topic.c b/topic.c
@@ -375,7 +375,7 @@ PHP_METHOD(RdKafka__ProducerTopic, produce)
     rd_kafka_resp_err_t err;
     kafka_topic_object *intern;
 
-    if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "lls|s", &partition, &msgflags, &payload, &payload_len, &key, &key_len) == FAILURE) {
+    if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "lls|s!", &partition, &msgflags, &payload, &payload_len, &key, &key_len) == FAILURE) {
         return;
     }