Fix empty arrays parsing

[m6w6/ext-pq] / src / php_pq_misc.c

diff --git a/src/php_pq_misc.c b/src/php_pq_misc.c
index 3f824edd8a5d0b34cf60f67bc374d0ebf352140b..619559d0fe724d393d299b72b467c0b84cd5a673 100644 (file)
--- a/src/php_pq_misc.c
+++ b/src/php_pq_misc.c
@@ -139,7 +139,11 @@ static PHP_METHOD(pqdt, __toString)
 ZEND_BEGIN_ARG_INFO_EX(ai_pqdt_create_from_format, 0, 0, 2)
        ZEND_ARG_INFO(0, format)
        ZEND_ARG_INFO(0, datetime)
+#if PHP_VERSION_ID >= 70200
+       ZEND_ARG_OBJ_INFO(0, object, DateTimeZone, 1)
+#else
        ZEND_ARG_INFO(0, timezone)
+#endif
 ZEND_END_ARG_INFO();
 static PHP_METHOD(pqdt, createFromFormat)
 {
@@ -314,6 +318,9 @@ static ZEND_RESULT_CODE parse_element(ArrayParserState *a, char delim)
        case '{':
                return parse_array(a);
 
+       case '}':
+               return SUCCESS;
+
        case '"':
                a->quotes = 1;
                ++a->ptr;
@@ -363,7 +370,7 @@ static ZEND_RESULT_CODE parse_element(ArrayParserState *a, char delim)
 
 static ZEND_RESULT_CODE parse_elements(ArrayParserState *a)
 {
-       char delims[] = {'}', PHP_PQ_DELIM_OF_ARRAY(a->typ), 0};
+       char delims[] = {'}', (char) PHP_PQ_DELIM_OF_ARRAY(a->typ), 0};
 
        while (SUCCESS == parse_element(a, delims[1])) {
                switch (caa(a, delims, 0)) {