MFH: fix parameter parsing in getrusage()

diff --git a/README.UPDATE_5_2 b/README.UPDATE_5_2
index 78f69c816a1bda63708efc0971e4e18da61b35c5..a9b84950a6fe33d9d1e294e199843c51dc3ac436 100644 (file)
--- a/README.UPDATE_5_2
+++ b/README.UPDATE_5_2
@@ -173,6 +173,14 @@ Items from the NEWS file explained
   you to fine-grain the levels of the messages stored.
 
 
+==============================
+Backwards incompatible changes
+==============================
+
+In the PHP core
+===============
+getrusage() will return NULL when passed incompatible arguments
+
 ==================
 NEW ERROR MESSAGES
 ==================

diff --git a/ext/standard/microtime.c b/ext/standard/microtime.c
index 36c9409688b02e45d31c6ec840ba10e07360e4ac..60a5c5e1dcc6cec5f1a8acd327f4ae50fc713eed 100644 (file)
--- a/ext/standard/microtime.c
+++ b/ext/standard/microtime.c
@@ -115,7 +115,11 @@ PHP_FUNCTION(getrusage)
        long pwho = 0;
        int who = RUSAGE_SELF;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &pwho) != FAILURE && pwho == 1) {
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &pwho) == FAILURE) {
+               return;
+       }
+       
+       if (pwho == 1) {
                who = RUSAGE_CHILDREN;
        }