[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/ext/posix/posix.c branches/PHP_5_3/ext/posix/posix.c trunk/ext/posix/posix.c

[Rasmus Lerdorf]

rasmus                                   Thu, 06 Aug 2009 10:56:00 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=286877

Log:
The user argument cannot be NULL here - fixes 2 tests

Changed paths:
    U   php/php-src/branches/PHP_5_2/ext/posix/posix.c
    U   php/php-src/branches/PHP_5_3/ext/posix/posix.c
    U   php/php-src/trunk/ext/posix/posix.c

Modified: php/php-src/branches/PHP_5_2/ext/posix/posix.c
===================================================================
--- php/php-src/branches/PHP_5_2/ext/posix/posix.c      2009-08-06 10:53:18 UTC 
(rev 286876)
+++ php/php-src/branches/PHP_5_2/ext/posix/posix.c      2009-08-06 10:56:00 UTC 
(rev 286877)
@@ -1196,6 +1196,8 @@
                RETURN_FALSE;
        }

+       if(strlen(name)==0) RETURN_FALSE;
+
        RETURN_BOOL(!initgroups((const char *)name, basegid));
 }
 /* }}} */

Modified: php/php-src/branches/PHP_5_3/ext/posix/posix.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/posix/posix.c      2009-08-06 10:53:18 UTC 
(rev 286876)
+++ php/php-src/branches/PHP_5_3/ext/posix/posix.c      2009-08-06 10:56:00 UTC 
(rev 286877)
@@ -1361,6 +1361,8 @@
                RETURN_FALSE;
        }

+       if(strlen(name)==0) RETURN_FALSE;
+
        RETURN_BOOL(!initgroups((const char *)name, basegid));
 }
 /* }}} */

Modified: php/php-src/trunk/ext/posix/posix.c
===================================================================
--- php/php-src/trunk/ext/posix/posix.c 2009-08-06 10:53:18 UTC (rev 286876)
+++ php/php-src/trunk/ext/posix/posix.c 2009-08-06 10:56:00 UTC (rev 286877)
@@ -1390,6 +1390,8 @@
                RETURN_FALSE;
        }

+       if(strlen(name)==0) RETURN_FALSE;
+
        RETURN_BOOL(!initgroups((const char *)name, basegid));
 }
 /* }}} */


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php