Merge branch 'PHP-5.5' into PHP-5.6

Author: laruence

main/main.c

@@ -1317,6 +1317,11 @@ PHPAPI char *php_get_current_user(TSRMLS_D)
 			return "";
 		}
 		pwd = &_pw;
+
+		if (retpwptr == NULL) {
+			efree(pwbuf);
+			return "";
+		}
 #else
 		if ((pwd=getpwuid(pstat->st_uid))==NULL) {
 			return "";