MFB: Improved parameter handling

1 files changed, 3 insertions, 4 deletions

diff --git a/sapi/apache2handler/php_functions.c b/sapi/apache2handler/php_functions.c
index 598b2ce567..45f7ac348d 100644
--- a/sapi/apache2handler/php_functions.c
+++ b/sapi/apache2handler/php_functions.c
@@ -221,12 +221,11 @@ PHP_FUNCTION(apache_response_headers)
 PHP_FUNCTION(apache_note)
 {
 	php_struct *ctx;
-	char *note_name, *note_val;
+	char *note_name, *note_val = NULL;
 	int note_name_len, note_val_len;
 	char *old_note_val=NULL;
-	int arg_count = ZEND_NUM_ARGS();
 
-	if (zend_parse_parameters(arg_count TSRMLS_CC, "s|s", &note_name, &note_name_len, &note_val, &note_val_len) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|s", &note_name, &note_name_len, &note_val, &note_val_len) == FAILURE) {
 		return;
 	}
 
@@ -234,7 +233,7 @@ PHP_FUNCTION(apache_note)
 
 	old_note_val = (char *) apr_table_get(ctx->r->notes, note_name);
 
-	if (arg_count == 2) {
+	if (note_val) {
 		apr_table_set(ctx->r->notes, note_name, note_val);
 	}