srinatar                                 Mon, 21 Dec 2009 20:39:48 +0000

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

Log:
Fixed bug #50540 (Crash within ldap_first_reference function)

Bug: http://bugs.php.net/50540 (Open) Segmentation fault while running 
ldap_next_reference 
      
Changed paths:
    U   php/php-src/branches/PHP_5_2/NEWS
    U   php/php-src/branches/PHP_5_2/ext/ldap/ldap.c
    U   php/php-src/branches/PHP_5_3/NEWS
    U   php/php-src/branches/PHP_5_3/ext/ldap/ldap.c
    U   php/php-src/trunk/ext/ldap/ldap.c

Modified: php/php-src/branches/PHP_5_2/NEWS
===================================================================
--- php/php-src/branches/PHP_5_2/NEWS   2009-12-21 20:37:44 UTC (rev 292436)
+++ php/php-src/branches/PHP_5_2/NEWS   2009-12-21 20:39:48 UTC (rev 292437)
@@ -3,6 +3,8 @@
 ?? ??? 2010, PHP 5.2.13
 - Fixed build of mysqli with MySQL 5.5.0-m2. (Andrey)

+- Fixed bug #50540 (Crash while running ldap_next_reference test cases).
+  (Sriram)
 - Fixed bug #50508 (compile failure: Conflicting HEADER type declarations).
   (Jani)
 - Fixed bug #50394 (Reference argument converted to value in __call). (Stas)

Modified: php/php-src/branches/PHP_5_2/ext/ldap/ldap.c
===================================================================
--- php/php-src/branches/PHP_5_2/ext/ldap/ldap.c        2009-12-21 20:37:44 UTC 
(rev 292436)
+++ php/php-src/branches/PHP_5_2/ext/ldap/ldap.c        2009-12-21 20:39:48 UTC 
(rev 292437)
@@ -2009,6 +2009,7 @@
                resultentry->id = Z_LVAL_PP(result);
                zend_list_addref(resultentry->id);
                resultentry->data = entry;
+               resultentry->ber = NULL;
        }
 }
 /* }}} */
@@ -2037,6 +2038,7 @@
                resultentry_next->id = resultentry->id;
                zend_list_addref(resultentry->id);
                resultentry_next->data = entry_next;
+               resultentry_next->ber = NULL;
        }
 }
 /* }}} */

Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS   2009-12-21 20:37:44 UTC (rev 292436)
+++ php/php-src/branches/PHP_5_3/NEWS   2009-12-21 20:39:48 UTC (rev 292437)
@@ -35,6 +35,8 @@
 - Fixed memory leak in extension loading when an error occurs on Windows.
   (Pierre)

+- Fixed bug #50540 (Crash while running ldap_next_reference test cases).
+  (Sriram)
 - Fixed bug #50508 (compile failure: Conflicting HEADER type declarations).
   (Jani)
 - Fixed bug #50496 (Use of <stdbool.h> is valid only in a c99 compilation

Modified: php/php-src/branches/PHP_5_3/ext/ldap/ldap.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/ldap/ldap.c        2009-12-21 20:37:44 UTC 
(rev 292436)
+++ php/php-src/branches/PHP_5_3/ext/ldap/ldap.c        2009-12-21 20:39:48 UTC 
(rev 292437)
@@ -1911,6 +1911,7 @@
                resultentry->id = Z_LVAL_P(result);
                zend_list_addref(resultentry->id);
                resultentry->data = entry;
+               resultentry->ber = NULL;
        }
 }
 /* }}} */
@@ -1939,6 +1940,7 @@
                resultentry_next->id = resultentry->id;
                zend_list_addref(resultentry->id);
                resultentry_next->data = entry_next;
+               resultentry_next->ber = NULL;
        }
 }
 /* }}} */

Modified: php/php-src/trunk/ext/ldap/ldap.c
===================================================================
--- php/php-src/trunk/ext/ldap/ldap.c   2009-12-21 20:37:44 UTC (rev 292436)
+++ php/php-src/trunk/ext/ldap/ldap.c   2009-12-21 20:39:48 UTC (rev 292437)
@@ -1965,6 +1965,7 @@
                resultentry->id = Z_LVAL_P(result);
                zend_list_addref(resultentry->id);
                resultentry->data = entry;
+               resultentry->ber = NULL;
        }
 }
 /* }}} */
@@ -1993,6 +1994,7 @@
                resultentry_next->id = resultentry->id;
                zend_list_addref(resultentry->id);
                resultentry_next->data = entry_next;
+               resultentry_next->ber = NULL;
        }
 }
 /* }}} */

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

Reply via email to