Merge branch 'PHP-5.4'

laruence · laruence · commit 9e2530bfe48e · 2012-08-15T00:32:42.000+08:00
diff --git a/ext/session/mod_user.c b/ext/session/mod_user.c
@@ -63,7 +63,7 @@ static zval *ps_call_handler(zval *func, int argc, zval **argv TSRMLS_DC)
 }
 
 #define STDVARS								\
-	zval *retval;							\
+	zval *retval = NULL;					\
 	int ret = FAILURE
 
 #define PSF(a) PS(mod_user_names).name.ps_##a

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ static zval ps_call_handler(zval func, int argc, zval **argv TSRMLS_DC)`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`#define STDVARS \`
`66`		`- zval *retval; \`
	`66`	`+ zval *retval = NULL; \`
`67`	`67`	`int ret = FAILURE`
`68`	`68`
`69`	`69`	`#define PSF(a) PS(mod_user_names).name.ps_##a`