From: Sean DuBois <sean@siobud.com>
Date: Tue, 29 Dec 2015 03:48:59 +0000 (+0000)
Subject: Fix calls to zend_parse_parameters that used long instead of zend_long for 'l', and... 
X-Git-Tag: RELEASE_3_0_0~2^2
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=refs%2Fpull%2F19%2Fhead;p=m6w6%2Fext-http

Fix calls to zend_parse_parameters that used long instead of zend_long for 'l', and optional values that were not initalized to null
---

diff --git a/src/php_http_cookie.c b/src/php_http_cookie.c
index 67b4494..2e29433 100644
--- a/src/php_http_cookie.c
+++ b/src/php_http_cookie.c
@@ -435,7 +435,7 @@ static PHP_METHOD(HttpCookie, __construct)
 {
 	php_http_cookie_object_t *obj;
 	zval *zcookie = NULL;
-	long flags = 0;
+	zend_long flags = 0;
 	char **ae = NULL;
 	HashTable *allowed_extras = NULL;
 	zend_error_handling zeh;
@@ -856,7 +856,7 @@ ZEND_BEGIN_ARG_INFO_EX(ai_HttpCookie_setExpires, 0, 0, 0)
 ZEND_END_ARG_INFO();
 static PHP_METHOD(HttpCookie, setExpires)
 {
-	long ts = -1;
+	zend_long ts = -1;
 	php_http_cookie_object_t *obj;
 
 	php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|l", &ts), invalid_arg, return);
@@ -892,7 +892,7 @@ ZEND_BEGIN_ARG_INFO_EX(ai_HttpCookie_setMaxAge, 0, 0, 0)
 ZEND_END_ARG_INFO();
 static PHP_METHOD(HttpCookie, setMaxAge)
 {
-	long ma = -1;
+	zend_long ma = -1;
 	php_http_cookie_object_t *obj;
 
 	php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|l", &ma), invalid_arg, return);
@@ -928,7 +928,7 @@ ZEND_BEGIN_ARG_INFO_EX(ai_HttpCookie_setFlags, 0, 0, 0)
 ZEND_END_ARG_INFO();
 static PHP_METHOD(HttpCookie, setFlags)
 {
-	long flags = 0;
+	zend_long flags = 0;
 	php_http_cookie_object_t *obj;
 
 	php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|l", &flags), invalid_arg, return);
diff --git a/src/php_http_header.c b/src/php_http_header.c
index f31e084..8242a7c 100644
--- a/src/php_http_header.c
+++ b/src/php_http_header.c
@@ -215,8 +215,8 @@ ZEND_BEGIN_ARG_INFO_EX(ai_HttpHeader_match, 0, 0, 1)
 ZEND_END_ARG_INFO();
 PHP_METHOD(HttpHeader, match)
 {
-	char *val_str;
-	size_t val_len;
+	char *val_str = NULL;
+	size_t val_len = 0;
 	zend_long flags = PHP_HTTP_MATCH_LOOSE;
 	zend_string *zs;
 	zval value_tmp;