|
||||||||||||||
|
New in This Group Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysql/tests/connect.inc branches/PHP_5_3/ext/mysqli/tests/connect.inc branches/PHP_5_3/ext/mysqli/tests/mysqli_poll_kill.phpt branches/PHP_5_3/e3/26/2010 9:44:09 PM Re: [PHP-CVS] svn: /php/php-src/trunk/ NEWS ext/standard/html.c ext/standard/tests/strings/bug44703.phpt ext/standard/tests/strings/get_html_translation_table_basic1.phpt ext/standard/tests/strings/3/26/2010 1:54:10 PM Re: [PHP-CVS] svn: /php/php-src/branches/ PHP_5_2/configure.in PHP_5_2/ext/standard/file.c PHP_5_2/main/SAPI.c PHP_5_2/main/SAPI.h PHP_5_2/main/rfc1867.c PHP_5_3/configure.in PHP_5_3/ext/standard/fi3/18/2010 10:16:51 PM Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/ext/zlib/tests/bug51269.phpt branches/PHP_5_2/ext/zlib/zlib.c branches/PHP_5_3/NEWS branches/PHP_5_3/ext/zlib/tests/bug51269.p3/11/2010 4:11:29 PM Question about traceability from vulnerability reports to source code12/15/2009 5:20:43 PM Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/ext/readline/config.m4 branches/PHP_5_2/ext/readline/readline.c branches/PHP_5_2/sapi/cli/php_cli.c branches/PHP_5_2/sapi/cli/12/13/2009 7:58:44 PM Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c branches/PHP_5_3/TSRM/tsrm_virtual_cwd.h branches/PHP_5_3/ext/standard/basic_functions.c branches/PHP_12/8/2009 1:39:04 AM Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/ext/gmp/gmp.c branches/PHP_5_2/ext/gmp/tests/bug50283.phpt branches/PHP_5_3/ext/gmp/gmp.c branches/PHP_5_3/ext/gmp/tests/bug5011/24/2009 1:55:52 PM Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/curl/streams.c branches/PHP_5_3/ext/standard/ftp_fopen_wrapper.c branches/PHP_5_3/ext/standard/http_fopen_wrapper.c branch11/15/2009 10:09:47 PM Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/ext/filter/logical_filters.c branches/PHP_5_2/ext/filter/tests/bug50158.phpt branches/PHP_5_3/NEWS branches/PHP_5_3/ext/filter11/15/2009 4:57:45 PM |
svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/Zend/zend_API.c trunk/Zend/zend_API.c
|
|||||||||||||
| Group: php.cvs |
Subscribe
|
Posted:11/30/2009 11:39:53 AM | Replies:2 | Views:36 | Items(2) |
|
--4bb61218a6afb9d9db0dbbd0dfa850b094ba5944
Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit dmitry Mon, 30 Nov 2009 11:39:53 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=291488 Log: Fixed bug #50261 (Crash When Calling Parent Constructor with call_user_func()) Bug: http://bugs.php.net/50261 (Assigned) Crash When Calling Parent Constructor with call_user_func() Changed paths: U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/Zend/zend_API.c U php/php-src/trunk/Zend/zend_API.c --4bb61218a6afb9d9db0dbbd0dfa850b094ba5944 Content-Type: text/x-diff; charset="utf-8" Content-Disposition: attachment; filename="svn-diffs-291488.txt" Content-Transfer-Encoding: base64 TW9kaWZpZWQ6IHBocC9waHAtc3JjL2JyYW5jaGVzL1BIUF81XzMvTkVXUwo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBwaHAv cGhwLXNyYy9icmFuY2hlcy9QSFBfNV8zL05FV1MJMjAwOS0xMS0zMCAxMToxODowMCBVVEMgKHJldiAy OTE0ODcpCisrKyBwaHAvcGhwLXNyYy9icmFuY2hlcy9QSFBfNV8zL05FV1MJMjAwOS0xMS0zMCAxMToz OTo1MyBVVEMgKHJldiAyOTE0ODgpCkBAIC0zMCw2ICszMCw4IEBACiAgIGNhbGxpbmcgZnVuY3Rpb24p LiAoRmVsaXBlKQogLSBGaXhlZCBidWcgIzUwMjY3IChnZXRfYnJvd3NlcihudWxsKSBkb2VzIG5vdCB1 c2UgSFRUUF9VU0VSX0FHRU5UKS4gKEphbmkpCiAtIEZpeGVkIGJ1ZyAjNTAyNjYgKGNvbmZsaWN0aW5n IHR5cGVzIGZvciBsbGFicykuIChKYW5pKQorLSBGaXhlZCBidWcgIzUwMjYxIChDcmFzaCBXaGVuIENh bGxpbmcgUGFyZW50IENvbnN0cnVjdG9yIHdpdGgKKyAgY2FsbF91c2VyX2Z1bmMoKSkuIChEbWl0cnkp CiAtIEZpeGVkIGJ1ZyAjNTAyNTUgKGlzc2V0KCkgYW5kIGVtcHR5KCkgc2lsZW50bHkgY2FzdHMgYXJy YXkgdG8gb2JqZWN0KS4KICAgKEZlbGlwZSkKIC0gRml4ZWQgYnVnICM1MDI0MCAocGRvX215c3FsLmRl ZmF1bHRfc29ja2V0IGluIHBocC5pbmkgc2hvdWxkbid0IHVzZWQKCk1vZGlmaWVkOiBwaHAvcGhwLXNy Yy9icmFuY2hlcy9QSFBfNV8zL1plbmQvemVuZF9BUEkuYwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBwaHAvcGhwLXNyYy9i cmFuY2hlcy9QSFBfNV8zL1plbmQvemVuZF9BUEkuYwkyMDA5LTExLTMwIDExOjE4OjAwIFVUQyAocmV2 IDI5MTQ4NykKKysrIHBocC9waHAtc3JjL2JyYW5jaGVzL1BIUF81XzMvWmVuZC96ZW5kX0FQSS5jCTIw MDktMTEtMzAgMTE6Mzk6NTMgVVRDIChyZXYgMjkxNDg4KQpAQCAtMjExNyw3ICsyMTE3LDcgQEAKICNp ZiBIQVZFX0xJQkRMCiAjaWYgIShkZWZpbmVkKE5FVFdBUkUpICYmIGRlZmluZWQoQVBBQ0hFXzFfQlVJ TEQpKQogCWlmIChtb2R1bGUtPmhhbmRsZSkgewotCQlETF9VTkxPQUQobW9kdWxlLT5oYW5kbGUpOwor Ly8JCURMX1VOTE9BRChtb2R1bGUtPmhhbmRsZSk7CiAJfQogI2VuZGlmCiAjZW5kaWYKQEAgLTIzMzUs MTIgKzIzMzUsMTMgQEAKIH0KIC8qIH19fSAqLwoKLXN0YXRpYyBpbnQgemVuZF9pc19jYWxsYWJsZV9j aGVja19jbGFzcyhjb25zdCBjaGFyICpuYW1lLCBpbnQgbmFtZV9sZW4sIHplbmRfZmNhbGxfaW5mb19j YWNoZSAqZmNjLCBjaGFyICoqZXJyb3IgVFNSTUxTX0RDKSAvKiB7e3sgKi8KK3N0YXRpYyBpbnQgemVu ZF9pc19jYWxsYWJsZV9jaGVja19jbGFzcyhjb25zdCBjaGFyICpuYW1lLCBpbnQgbmFtZV9sZW4sIHpl bmRfZmNhbGxfaW5mb19jYWNoZSAqZmNjLCBpbnQgKnN0cmljdF9jbGFzcywgY2hhciAqKmVycm9yIFRT Uk1MU19EQykgLyoge3t7ICovCiB7CiAJaW50IHJldCA9IDA7CiAJemVuZF9jbGFzc19lbnRyeSAqKnBj ZTsKIAljaGFyICpsY25hbWUgPSB6ZW5kX3N0cl90b2xvd2VyX2R1cChuYW1lLCBuYW1lX2xlbik7Cgor CSpzdHJpY3RfY2xhc3MgPSAwOwogCWlmIChuYW1lX2xlbiA9PSBzaXplb2YoInNlbGYiKSAtIDEgJiYK IAkgICAgIW1lbWNtcChsY25hbWUsICJzZWxmIiwgc2l6ZW9mKCJzZWxmIikgLSAxKSkgewogCQlpZiAo IUVHKHNjb3BlKSkgewpAQCAtMjM2NSw2ICsyMzY2LDcgQEAKIAkJCWlmICghZmNjLT5vYmplY3RfcHRy KSB7CiAJCQkJZmNjLT5vYmplY3RfcHRyID0gRUcoVGhpcyk7CiAJCQl9CisJCQkqc3RyaWN0X2NsYXNz ID0gMTsKIAkJCXJldCA9IDE7CiAJCX0KIAl9IGVsc2UgaWYgKG5hbWVfbGVuID09IHNpemVvZigic3Rh dGljIikgLSAxICYmCkBAIC0yMzc3LDYgKzIzNzksNyBAQAogCQkJaWYgKCFmY2MtPm9iamVjdF9wdHIp IHsKIAkJCQlmY2MtPm9iamVjdF9wdHIgPSBFRyhUaGlzKTsKIAkJCX0KKwkJCSpzdHJpY3RfY2xhc3Mg PSAxOwogCQkJcmV0ID0gMTsKIAkJfQogCX0gZWxzZSBpZiAoemVuZF9sb29rdXBfY2xhc3NfZXgobmFt ZSwgbmFtZV9sZW4sIDEsICZwY2UgVFNSTUxTX0NDKSA9PSBTVUNDRVNTKSB7CkBAIC0yMzkxLDYgKzIz OTQsNyBAQAogCQl9IGVsc2UgewogCQkJZmNjLT5jYWxsZWRfc2NvcGUgPSBmY2MtPm9iamVjdF9wdHIg PyBaX09CSkNFX1AoZmNjLT5vYmplY3RfcHRyKSA6IGZjYy0+Y2FsbGluZ19zY29wZTsKIAkJfQorCQkq c3RyaWN0X2NsYXNzID0gMTsKIAkJcmV0ID0gMTsKIAl9IGVsc2UgewogCQlpZiAoZXJyb3IpIHplbmRf c3BwcmludGYoZXJyb3IsIDAsICJjbGFzcyAnJS4qcycgbm90IGZvdW5kIiwgbmFtZV9sZW4sIG5hbWUp OwpAQCAtMjQwMSw3ICsyNDA1LDcgQEAKIC8qIH19fSAqLwoKCi1zdGF0aWMgaW50IHplbmRfaXNfY2Fs bGFibGVfY2hlY2tfZnVuYyhpbnQgY2hlY2tfZmxhZ3MsIHp2YWwgKmNhbGxhYmxlLCB6ZW5kX2ZjYWxs X2luZm9fY2FjaGUgKmZjYywgY2hhciAqKmVycm9yIFRTUk1MU19EQykgLyoge3t7ICovCitzdGF0aWMg aW50IHplbmRfaXNfY2FsbGFibGVfY2hlY2tfZnVuYyhpbnQgY2hlY2tfZmxhZ3MsIHp2YWwgKmNhbGxh YmxlLCB6ZW5kX2ZjYWxsX2luZm9fY2FjaGUgKmZjYywgaW50IHN0cmljdF9jbGFzcywgY2hhciAqKmVy cm9yIFRTUk1MU19EQykgLyoge3t7ICovCiB7CiAJemVuZF9jbGFzc19lbnRyeSAqY2Vfb3JnID0gZmNj LT5jYWxsaW5nX3Njb3BlOwogCWludCByZXR2YWwgPSAwOwpAQCAtMjQ1OSw3ICsyNDYzLDcgQEAKIAkJ CUVHKHNjb3BlKSA9IGNlX29yZzsKIAkJfQoKLQkJaWYgKCF6ZW5kX2lzX2NhbGxhYmxlX2NoZWNrX2Ns YXNzKFpfU1RSVkFMX1AoY2FsbGFibGUpLCBjbGVuLCBmY2MsIGVycm9yIFRTUk1MU19DQykpIHsKKwkJ aWYgKCF6ZW5kX2lzX2NhbGxhYmxlX2NoZWNrX2NsYXNzKFpfU1RSVkFMX1AoY2FsbGFibGUpLCBjbGVu LCBmY2MsICZzdHJpY3RfY2xhc3MsIGVycm9yIFRTUk1MU19DQykpIHsKIAkJCUVHKHNjb3BlKSA9IGxh c3Rfc2NvcGU7CiAJCQlyZXR1cm4gMDsKIAkJfQpAQCAtMjQ4Niw3ICsyNDkwLDE1IEBACiAJfQoKIAls bW5hbWUgPSB6ZW5kX3N0cl90b2xvd2VyX2R1cChtbmFtZSwgbWxlbik7Ci0JaWYgKHplbmRfaGFzaF9m aW5kKGZ0YWJsZSwgbG1uYW1lLCBtbGVuKzEsICh2b2lkKiopJmZjYy0+ZnVuY3Rpb25faGFuZGxlcikg PT0gU1VDQ0VTUykgeworCWlmIChzdHJpY3RfY2xhc3MgJiYKKwkgICAgZmNjLT5jYWxsaW5nX3Njb3Bl ICYmCisJICAgIG1sZW4gPT0gc2l6ZW9mKFpFTkRfQ09OU1RSVUNUT1JfRlVOQ19OQU1FKS0xICYmCisJ ICAgICFtZW1jbXAobG1uYW1lLCBaRU5EX0NPTlNUUlVDVE9SX0ZVTkNfTkFNRSwgc2l6ZW9mKFpFTkRf Q09OU1RSVUNUT1JfRlVOQ19OQU1FKSkpIHsKKwkJZmNjLT5mdW5jdGlvbl9oYW5kbGVyID0gZmNjLT5j YWxsaW5nX3Njb3BlLT5jb25zdHJ1Y3RvcjsKKwkJaWYgKGZjYy0+ZnVuY3Rpb25faGFuZGxlcikgewor CQkJcmV0dmFsID0gMTsKKwkJfQorCX0gZWxzZSBpZiAoemVuZF9oYXNoX2ZpbmQoZnRhYmxlLCBsbW5h bWUsIG1sZW4rMSwgKHZvaWQqKikmZmNjLT5mdW5jdGlvbl9oYW5kbGVyKSA9PSBTVUNDRVNTKSB7CiAJ CXJldHZhbCA9IDE7CiAJCWlmICgoZmNjLT5mdW5jdGlvbl9oYW5kbGVyLT5vcF9hcnJheS5mbl9mbGFn cyAmIFpFTkRfQUNDX0NIQU5HRUQpICYmCiAJCSAgICBFRyhzY29wZSkgJiYKQEAgLTI1MjAsMTEgKzI1 MzIsMzYgQEAKIAl9IGVsc2UgewogZ2V0X2Z1bmN0aW9uX3ZpYV9oYW5kbGVyOgogCQlpZiAoZmNjLT5v YmplY3RfcHRyICYmIGZjYy0+Y2FsbGluZ19zY29wZSA9PSBjZV9vcmcpIHsKLQkJCWlmIChaX09CSl9I VF9QKGZjYy0+b2JqZWN0X3B0ciktPmdldF9tZXRob2QpIHsKKwkJCWlmIChzdHJpY3RfY2xhc3MgJiYg Y2Vfb3JnLT5fX2NhbGwpIHsKKwkJCQlmY2MtPmZ1bmN0aW9uX2hhbmRsZXIgPSBlbWFsbG9jKHNpemVv Zih6ZW5kX2ludGVybmFsX2Z1bmN0aW9uKSk7CisJCQkJZmNjLT5mdW5jdGlvbl9oYW5kbGVyLT5pbnRl cm5hbF9mdW5jdGlvbi50eXBlID0gWkVORF9JTlRFUk5BTF9GVU5DVElPTjsKKwkJCQlmY2MtPmZ1bmN0 aW9uX2hhbmRsZXItPmludGVybmFsX2Z1bmN0aW9uLm1vZHVsZSA9IGNlX29yZy0+bW9kdWxlOworCQkJ CWZjYy0+ZnVuY3Rpb25faGFuZGxlci0+aW50ZXJuYWxfZnVuY3Rpb24uaGFuZGxlciA9IHplbmRfc3Rk X2NhbGxfdXNlcl9jYWxsOworCQkJCWZjYy0+ZnVuY3Rpb25faGFuZGxlci0+aW50ZXJuYWxfZnVuY3Rp b24uYXJnX2luZm8gPSBOVUxMOworCQkJCWZjYy0+ZnVuY3Rpb25faGFuZGxlci0+aW50ZXJuYWxfZnVu Y3Rpb24ubnVtX2FyZ3MgPSAwOworCQkJCWZjYy0+ZnVuY3Rpb25faGFuZGxlci0+aW50ZXJuYWxfZnVu Y3Rpb24uc2NvcGUgPSBjZV9vcmc7CisJCQkJZmNjLT5mdW5jdGlvbl9oYW5kbGVyLT5pbnRlcm5hbF9m dW5jdGlvbi5mbl9mbGFncyA9IFpFTkRfQUNDX0NBTExfVklBX0hBTkRMRVI7CisJCQkJZmNjLT5mdW5j dGlvbl9oYW5kbGVyLT5pbnRlcm5hbF9mdW5jdGlvbi5mdW5jdGlvbl9uYW1lID0gZXN0cm5kdXAobW5h bWUsIG1sZW4pOworCQkJCWZjYy0+ZnVuY3Rpb25faGFuZGxlci0+aW50ZXJuYWxfZnVuY3Rpb24ucGFz c19yZXN0X2J5X3JlZmVyZW5jZSA9IDA7CisJCQkJZmNjLT5mdW5jdGlvbl9oYW5kbGVyLT5pbnRlcm5h bF9mdW5jdGlvbi5yZXR1cm5fcmVmZXJlbmNlID0gWkVORF9SRVRVUk5fVkFMVUU7CisJCQkJY2FsbF92 aWFfaGFuZGxlciA9IDE7CisJCQkJcmV0dmFsID0gMTsKKwkJCX0gZWxzZSBpZiAoWl9PQkpfSFRfUChm Y2MtPm9iamVjdF9wdHIpLT5nZXRfbWV0aG9kKSB7CiAJCQkJZmNjLT5mdW5jdGlvbl9oYW5kbGVyID0g Wl9PQkpfSFRfUChmY2MtPm9iamVjdF9wdHIpLT5nZXRfbWV0aG9kKCZmY2MtPm9iamVjdF9wdHIsIG1u YW1lLCBtbGVuIFRTUk1MU19DQyk7CiAJCQkJaWYgKGZjYy0+ZnVuY3Rpb25faGFuZGxlcikgewotCQkJ CQlyZXR2YWwgPSAxOwotCQkJCQljYWxsX3ZpYV9oYW5kbGVyID0gKGZjYy0+ZnVuY3Rpb25faGFuZGxl ci0+Y29tbW9uLmZuX2ZsYWdzICYgWkVORF9BQ0NfQ0FMTF9WSUFfSEFORExFUikgIT0gMDsKKwkJCQkJ aWYgKHN0cmljdF9jbGFzcyAmJgorCQkJCQkgICAgKCFmY2MtPmZ1bmN0aW9uX2hhbmRsZXItPmNvbW1v bi5zY29wZSB8fAorCQkJCQkgICAgICFpbnN0YW5jZW9mX2Z1bmN0aW9uKGNlX29yZywgZmNjLT5mdW5j dGlvbl9oYW5kbGVyLT5jb21tb24uc2NvcGUgVFNSTUxTX0NDKSkpIHsKKwkJCQkJCWlmICgoZmNjLT5m dW5jdGlvbl9oYW5kbGVyLT5jb21tb24uZm5fZmxhZ3MgJiBaRU5EX0FDQ19DQUxMX1ZJQV9IQU5ETEVS KSAhPSAwKSB7CisJCQkJCQkJaWYgKGZjYy0+ZnVuY3Rpb25faGFuZGxlci0+dHlwZSAhPSBaRU5EX09W RVJMT0FERURfRlVOQ1RJT04pIHsKKwkJCQkJCQkJZWZyZWUoZmNjLT5mdW5jdGlvbl9oYW5kbGVyLT5j b21tb24uZnVuY3Rpb25fbmFtZSk7CisJCQkJCQkJfQorCQkJCQkJCWVmcmVlKGZjYy0+ZnVuY3Rpb25f aGFuZGxlcik7CisJCQkJCQl9CisJCQkJCX0gZWxzZSB7CisJCQkJCQlyZXR2YWwgPSAxOworCQkJCQkJ Y2FsbF92aWFfaGFuZGxlciA9IChmY2MtPmZ1bmN0aW9uX2hhbmRsZXItPmNvbW1vbi5mbl9mbGFncyAm IFpFTkRfQUNDX0NBTExfVklBX0hBTkRMRVIpICE9IDA7CisJCQkJCX0KIAkJCQl9CiAJCQl9CiAJCX0g ZWxzZSBpZiAoZmNjLT5jYWxsaW5nX3Njb3BlKSB7CkBAIC0yNjgwLDcgKzI3MTcsNyBAQAogCQkJCXJl dHVybiAxOwogCQkJfQoKLQkJCXJldCA9IHplbmRfaXNfY2FsbGFibGVfY2hlY2tfZnVuYyhjaGVja19m bGFncywgY2FsbGFibGUsIGZjYywgZXJyb3IgVFNSTUxTX0NDKTsKKwkJCXJldCA9IHplbmRfaXNfY2Fs bGFibGVfY2hlY2tfZnVuYyhjaGVja19mbGFncywgY2FsbGFibGUsIGZjYywgMCwgZXJyb3IgVFNSTUxT X0NDKTsKIAkJCWlmIChmY2MgPT0gJmZjY19sb2NhbCAmJgogCQkJICAgIGZjYy0+ZnVuY3Rpb25faGFu ZGxlciAmJgogCQkJCSgoZmNjLT5mdW5jdGlvbl9oYW5kbGVyLT50eXBlID09IFpFTkRfSU5URVJOQUxf RlVOQ1RJT04gJiYKQEAgLTI2OTgsNiArMjczNSw3IEBACiAJCQl7CiAJCQkJenZhbCAqKm1ldGhvZCA9 IE5VTEw7CiAJCQkJenZhbCAqKm9iaiA9IE5VTEw7CisJCQkJaW50IHN0cmljdF9jbGFzcyA9IDA7Cgog CQkJCWlmICh6ZW5kX2hhc2hfbnVtX2VsZW1lbnRzKFpfQVJSVkFMX1AoY2FsbGFibGUpKSA9PSAyKSB7 CiAJCQkJCXplbmRfaGFzaF9pbmRleF9maW5kKFpfQVJSVkFMX1AoY2FsbGFibGUpLCAwLCAodm9pZCAq KikgJm9iaik7CkBAIC0yNzI1LDcgKzI3NjMsNyBAQAogCQkJCQkJCXJldHVybiAxOwogCQkJCQkJfQoK LQkJCQkJCWlmICghemVuZF9pc19jYWxsYWJsZV9jaGVja19jbGFzcyhaX1NUUlZBTF9QUChvYmopLCBa X1NUUkxFTl9QUChvYmopLCBmY2MsIGVycm9yIFRTUk1MU19DQykpIHsKKwkJCQkJCWlmICghemVuZF9p c19jYWxsYWJsZV9jaGVja19jbGFzcyhaX1NUUlZBTF9QUChvYmopLCBaX1NUUkxFTl9QUChvYmopLCBm Y2MsICZzdHJpY3RfY2xhc3MsIGVycm9yIFRTUk1MU19DQykpIHsKIAkJCQkJCQlyZXR1cm4gMDsKIAkJ CQkJCX0KCkBAIC0yNzU3LDcgKzI3OTUsNyBAQAogCQkJCQkJfQogCQkJCQl9CgotCQkJCQlyZXQgPSB6 ZW5kX2lzX2NhbGxhYmxlX2NoZWNrX2Z1bmMoY2hlY2tfZmxhZ3MsICptZXRob2QsIGZjYywgZXJyb3Ig VFNSTUxTX0NDKTsKKwkJCQkJcmV0ID0gemVuZF9pc19jYWxsYWJsZV9jaGVja19mdW5jKGNoZWNrX2Zs YWdzLCAqbWV0aG9kLCBmY2MsIHN0cmljdF9jbGFzcywgZXJyb3IgVFNSTUxTX0NDKTsKIAkJCQkJaWYg KGZjYyA9PSAmZmNjX2xvY2FsICYmCiAJCQkJCSAgICBmY2MtPmZ1bmN0aW9uX2hhbmRsZXIgJiYKIAkJ CQkJCSgoZmNjLT5mdW5jdGlvbl9oYW5kbGVyLT50eXBlID09IFpFTkRfSU5URVJOQUxfRlVOQ1RJT04g JiYKCk1vZGlmaWVkOiBwaHAvcGhwLXNyYy90cnVuay9aZW5kL3plbmRfQVBJLmMKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g cGhwL3BocC1zcmMvdHJ1bmsvWmVuZC96ZW5kX0FQSS5jCTIwMDktMTEtMzAgMTE6MTg6MDAgVVRDIChy ZXYgMjkxNDg3KQorKysgcGhwL3BocC1zcmMvdHJ1bmsvWmVuZC96ZW5kX0FQSS5jCTIwMDktMTEtMzAg MTE6Mzk6NTMgVVRDIChyZXYgMjkxNDg4KQpAQCAtMjcxMCwxMyArMjcxMCwxNCBAQAogfQogLyogfX19 ICovCgotc3RhdGljIGludCB6ZW5kX2lzX2NhbGxhYmxlX2NoZWNrX2NsYXNzKHplbmRfdWNoYXIgdXR5 cGUsIGNvbnN0IHpzdHIgbmFtZSwgaW50IG5hbWVfbGVuLCB6ZW5kX2ZjYWxsX2luZm9fY2FjaGUgKmZj YywgY2hhciAqKmVycm9yIFRTUk1MU19EQykgLyoge3t7ICovCitzdGF0aWMgaW50IHplbmRfaXNfY2Fs bGFibGVfY2hlY2tfY2xhc3MoemVuZF91Y2hhciB1dHlwZSwgY29uc3QgenN0ciBuYW1lLCBpbnQgbmFt ZV9sZW4sIHplbmRfZmNhbGxfaW5mb19jYWNoZSAqZmNjLCBpbnQgKnN0cmljdF9jbGFzcywgY2hhciAq KmVycm9yIFRTUk1MU19EQykgLyoge3t7ICovCiB7CiAJaW50IHJldCA9IDA7CiAJemVuZF9jbGFzc19l bnRyeSAqKnBjZTsKIAl1bnNpZ25lZCBpbnQgbGNuYW1lX2xlbjsKIAl6c3RyIGxjbmFtZSA9IHplbmRf dV9zdHJfY2FzZV9mb2xkKHV0eXBlLCBuYW1lLCBuYW1lX2xlbiwgMSwgJmxjbmFtZV9sZW4pOwoKKwkq c3RyaWN0X2NsYXNzID0gMDsKIAlpZiAobGNuYW1lX2xlbiA9PSBzaXplb2YoInNlbGYiKSAtIDEgJiYK IAkgICAgWkVORF9VX0VRVUFMKHV0eXBlLCBsY25hbWUsIGxjbmFtZV9sZW4sICJzZWxmIiwgc2l6ZW9m KCJzZWxmIikgLSAxKSkgewogCQlpZiAoIUVHKHNjb3BlKSkgewpAQCAtMjcyNyw2ICsyNzI4LDcgQEAK IAkJCWlmICghZmNjLT5vYmplY3RfcHRyKSB7CiAJCQkJZmNjLT5vYmplY3RfcHRyID0gRUcoVGhpcyk7 CiAJCQl9CisJCQkqc3RyaWN0X2NsYXNzID0gMTsKIAkJCXJldCA9IDE7CiAJCX0KIAl9IGVsc2UgaWYg KGxjbmFtZV9sZW4gPT0gc2l6ZW9mKCJwYXJlbnQiKSAtIDEgJiYKQEAgLTI3NDEsNiArMjc0Myw3IEBA CiAJCQlpZiAoIWZjYy0+b2JqZWN0X3B0cikgewogCQkJCWZjYy0+b2JqZWN0X3B0ciA9IEVHKFRoaXMp OwogCQkJfQorCQkJKnN0cmljdF9jbGFzcyA9IDE7CiAJCQlyZXQgPSAxOwogCQl9CiAJfSBlbHNlIGlm IChsY25hbWVfbGVuID09IHNpemVvZigic3RhdGljIikgLSAxICYmCkBAIC0yNzY3LDYgKzI3NzAsNyBA QAogCQl9IGVsc2UgewogCQkJZmNjLT5jYWxsZWRfc2NvcGUgPSBmY2MtPm9iamVjdF9wdHIgPyBaX09C SkNFX1AoZmNjLT5vYmplY3RfcHRyKSA6IGZjYy0+Y2FsbGluZ19zY29wZTsKIAkJfQorCQkqc3RyaWN0 X2NsYXNzID0gMTsKIAkJcmV0ID0gMTsKIAl9IGVsc2UgewogCQlpZiAoZXJyb3IpIHsKQEAgLTI3ODUs NyArMjc4OSw3IEBACiB9CiAvKiB9fX0gKi8KCi1zdGF0aWMgaW50IHplbmRfaXNfY2FsbGFibGVfY2hl Y2tfZnVuYyhpbnQgY2hlY2tfZmxhZ3MsIHp2YWwgKmNhbGxhYmxlLCB6ZW5kX2ZjYWxsX2luZm9fY2Fj aGUgKmZjYywgY2hhciAqKmVycm9yIFRTUk1MU19EQykgLyoge3t7ICovCitzdGF0aWMgaW50IHplbmRf aXNfY2FsbGFibGVfY2hlY2tfZnVuYyhpbnQgY2hlY2tfZmxhZ3MsIHp2YWwgKmNhbGxhYmxlLCB6ZW5k X2ZjYWxsX2luZm9fY2FjaGUgKmZjYywgaW50IHN0cmljdF9jbGFzcywgY2hhciAqKmVycm9yIFRTUk1M U19EQykgLyoge3t7ICovCiB7CiAJemVuZF9jbGFzc19lbnRyeSAqY2Vfb3JnID0gZmNjLT5jYWxsaW5n X3Njb3BlOwogCWludCByZXR2YWwgPSAwOwpAQCAtMjg2NCw3ICsyODY4LDcgQEAKIAkJCUVHKHNjb3Bl KSA9IGNlX29yZzsKIAkJfQoKLQkJaWYgKCF6ZW5kX2lzX2NhbGxhYmxlX2NoZWNrX2NsYXNzKFpfVFlQ RV9QKGNhbGxhYmxlKSwgWl9VTklWQUxfUChjYWxsYWJsZSksIGNsZW4sIGZjYywgZXJyb3IgVFNSTUxT X0NDKSkgeworCQlpZiAoIXplbmRfaXNfY2FsbGFibGVfY2hlY2tfY2xhc3MoWl9UWVBFX1AoY2FsbGFi bGUpLCBaX1VOSVZBTF9QKGNhbGxhYmxlKSwgY2xlbiwgZmNjLCAmc3RyaWN0X2NsYXNzLCBlcnJvciBU U1JNTFNfQ0MpKSB7CiAJCQlFRyhzY29wZSkgPSBsYXN0X3Njb3BlOwogCQkJcmV0dXJuIDA7CiAJCX0K QEAgLTI4OTAsNyArMjg5NCwxNSBAQAogCX0KCiAJbG1uYW1lID0gemVuZF91X3N0cl9jYXNlX2ZvbGQo Wl9UWVBFX1AoY2FsbGFibGUpLCBtbmFtZSwgbWxlbiwgMSwgJmxtbGVuKTsKLQlpZiAoemVuZF91X2hh c2hfZmluZChmdGFibGUsIFpfVFlQRV9QKGNhbGxhYmxlKSwgbG1uYW1lLCBsbWxlbisxLCAodm9pZCoq KSZmY2MtPmZ1bmN0aW9uX2hhbmRsZXIpID09IFNVQ0NFU1MpIHsKKwlpZiAoc3RyaWN0X2NsYXNzICYm CisJICAgIGZjYy0+Y2FsbGluZ19zY29wZSAmJgorCSAgICBtbGVuID09IHNpemVvZihaRU5EX0NPTlNU UlVDVE9SX0ZVTkNfTkFNRSktMSAmJgorCSAgICBaRU5EX1VfRVFVQUwoWl9UWVBFX1AoY2FsbGFibGUp LCBsbW5hbWUsIGxtbGVuLCBaRU5EX0NPTlNUUlVDVE9SX0ZVTkNfTkFNRSwgc2l6ZW9mKFpFTkRfQ09O U1RSVUNUT1JfRlVOQ19OQU1FKS0xKSkgeworCQlmY2MtPmZ1bmN0aW9uX2hhbmRsZXIgPSBmY2MtPmNh bGxpbmdfc2NvcGUtPmNvbnN0cnVjdG9yOworCQlpZiAoZmNjLT5mdW5jdGlvbl9oYW5kbGVyKSB7CisJ CQlyZXR2YWwgPSAxOworCQl9CisJfSBlbHNlIGlmICh6ZW5kX3VfaGFzaF9maW5kKGZ0YWJsZSwgWl9U WVBFX1AoY2FsbGFibGUpLCBsbW5hbWUsIGxtbGVuKzEsICh2b2lkKiopJmZjYy0+ZnVuY3Rpb25faGFu ZGxlcikgPT0gU1VDQ0VTUykgewogCQlyZXR2YWwgPSAxOwogCQlpZiAoKGZjYy0+ZnVuY3Rpb25faGFu ZGxlci0+b3BfYXJyYXkuZm5fZmxhZ3MgJiBaRU5EX0FDQ19DSEFOR0VEKSAmJgogCQkgICAgRUcoc2Nv cGUpICYmCkBAIC0yOTI0LDcgKzI5MzYsMjUgQEAKIAl9IGVsc2UgewogZ2V0X2Z1bmN0aW9uX3ZpYV9o YW5kbGVyOgogCQlpZiAoZmNjLT5vYmplY3RfcHRyICYmIGZjYy0+Y2FsbGluZ19zY29wZSA9PSBjZV9v cmcpIHsKLQkJCWlmIChaX09CSl9IVF9QKGZjYy0+b2JqZWN0X3B0ciktPmdldF9tZXRob2QpIHsKKwkJ CWlmIChzdHJpY3RfY2xhc3MgJiYgY2Vfb3JnLT5fX2NhbGwpIHsKKwkJCQlmY2MtPmZ1bmN0aW9uX2hh bmRsZXIgPSBlbWFsbG9jKHNpemVvZih6ZW5kX2ludGVybmFsX2Z1bmN0aW9uKSk7CisJCQkJZmNjLT5m dW5jdGlvbl9oYW5kbGVyLT5pbnRlcm5hbF9mdW5jdGlvbi50eXBlID0gWkVORF9JTlRFUk5BTF9GVU5D VElPTjsKKwkJCQlmY2MtPmZ1bmN0aW9uX2hhbmRsZXItPmludGVybmFsX2Z1bmN0aW9uLm1vZHVsZSA9 IGNlX29yZy0+bW9kdWxlOworCQkJCWZjYy0+ZnVuY3Rpb25faGFuZGxlci0+aW50ZXJuYWxfZnVuY3Rp b24uaGFuZGxlciA9IHplbmRfc3RkX2NhbGxfdXNlcl9jYWxsOworCQkJCWZjYy0+ZnVuY3Rpb25faGFu ZGxlci0+aW50ZXJuYWxfZnVuY3Rpb24uYXJnX2luZm8gPSBOVUxMOworCQkJCWZjYy0+ZnVuY3Rpb25f aGFuZGxlci0+aW50ZXJuYWxfZnVuY3Rpb24ubnVtX2FyZ3MgPSAwOworCQkJCWZjYy0+ZnVuY3Rpb25f aGFuZGxlci0+aW50ZXJuYWxfZnVuY3Rpb24uc2NvcGUgPSBjZV9vcmc7CisJCQkJZmNjLT5mdW5jdGlv bl9oYW5kbGVyLT5pbnRlcm5hbF9mdW5jdGlvbi5mbl9mbGFncyA9IFpFTkRfQUNDX0NBTExfVklBX0hB TkRMRVI7CisJCQkJaWYgKFpfVFlQRV9QKGNhbGxhYmxlKSA9PSBJU19TVFJJTkcpIHsKKwkJCQkJZmNj LT5mdW5jdGlvbl9oYW5kbGVyLT5pbnRlcm5hbF9mdW5jdGlvbi5mdW5jdGlvbl9uYW1lLnMgPSBlc3Ry bmR1cChtbmFtZS5zLCBsbWxlbik7CisJCQkJfSBlbHNlIHsKKwkJCQkJZmNjLT5mdW5jdGlvbl9oYW5k bGVyLT5pbnRlcm5hbF9mdW5jdGlvbi5mdW5jdGlvbl9uYW1lLnUgPSBldXN0cm5kdXAobW5hbWUudSwg bG1sZW4pOworCQkJCX0KKwkJCQlmY2MtPmZ1bmN0aW9uX2hhbmRsZXItPmludGVybmFsX2Z1bmN0aW9u LnBhc3NfcmVzdF9ieV9yZWZlcmVuY2UgPSAwOworCQkJCWZjYy0+ZnVuY3Rpb25faGFuZGxlci0+aW50 ZXJuYWxfZnVuY3Rpb24ucmV0dXJuX3JlZmVyZW5jZSA9IFpFTkRfUkVUVVJOX1ZBTFVFOworCQkJCWNh bGxfdmlhX2hhbmRsZXIgPSAxOworCQkJCXJldHZhbCA9IDE7CisJCQl9IGVsc2UgaWYgKFpfT0JKX0hU X1AoZmNjLT5vYmplY3RfcHRyKS0+Z2V0X21ldGhvZCkgewogCQkJCXpzdHIgbWV0aG9kID0gbW5hbWU7 CiAJCQkJaW50IG1ldGhvZF9sZW4gPSBtbGVuOwoKQEAgLTI5MzYsNiArMjk2NiwxOSBAQAogCQkJCQll ZnJlZShtZXRob2Qudik7CiAJCQkJfQogCQkJCWlmIChmY2MtPmZ1bmN0aW9uX2hhbmRsZXIpIHsKKwkJ CQkJaWYgKHN0cmljdF9jbGFzcyAmJgorCQkJCQkgICAgKCFmY2MtPmZ1bmN0aW9uX2hhbmRsZXItPmNv bW1vbi5zY29wZSB8fAorCQkJCQkgICAgICFpbnN0YW5jZW9mX2Z1bmN0aW9uKGNlX29yZywgZmNjLT5m dW5jdGlvbl9oYW5kbGVyLT5jb21tb24uc2NvcGUgVFNSTUxTX0NDKSkpIHsKKwkJCQkJCWlmICgoZmNj LT5mdW5jdGlvbl9oYW5kbGVyLT5jb21tb24uZm5fZmxhZ3MgJiBaRU5EX0FDQ19DQUxMX1ZJQV9IQU5E TEVSKSAhPSAwKSB7CisJCQkJCQkJaWYgKGZjYy0+ZnVuY3Rpb25faGFuZGxlci0+dHlwZSAhPSBaRU5E X09WRVJMT0FERURfRlVOQ1RJT04pIHsKKwkJCQkJCQkJZWZyZWUoZmNjLT5mdW5jdGlvbl9oYW5kbGVy LT5jb21tb24uZnVuY3Rpb25fbmFtZS52KTsKKwkJCQkJCQl9CisJCQkJCQkJZWZyZWUoZmNjLT5mdW5j dGlvbl9oYW5kbGVyKTsKKwkJCQkJCX0KKwkJCQkJfSBlbHNlIHsKKwkJCQkJCXJldHZhbCA9IDE7CisJ CQkJCQljYWxsX3ZpYV9oYW5kbGVyID0gKGZjYy0+ZnVuY3Rpb25faGFuZGxlci0+Y29tbW9uLmZuX2Zs YWdzICYgWkVORF9BQ0NfQ0FMTF9WSUFfSEFORExFUikgIT0gMDsKKwkJCQkJfQogCQkJCQlyZXR2YWwg PSAxOwogCQkJCQljYWxsX3ZpYV9oYW5kbGVyID0gKGZjYy0+ZnVuY3Rpb25faGFuZGxlci0+Y29tbW9u LmZuX2ZsYWdzICYgWkVORF9BQ0NfQ0FMTF9WSUFfSEFORExFUikgIT0gMDsKIAkJCQl9CkBAIC0zMDk5 LDcgKzMxNDIsNyBAQAogCQkJCXJldHVybiAxOwogCQkJfQoKLQkJCXJldCA9IHplbmRfaXNfY2FsbGFi bGVfY2hlY2tfZnVuYyhjaGVja19mbGFncywgY2FsbGFibGUsIGZjYywgZXJyb3IgVFNSTUxTX0NDKTsK KwkJCXJldCA9IHplbmRfaXNfY2FsbGFibGVfY2hlY2tfZnVuYyhjaGVja19mbGFncywgY2FsbGFibGUs IGZjYywgMCwgZXJyb3IgVFNSTUxTX0NDKTsKIAkJCWlmIChmY2MgPT0gJmZjY19sb2NhbCAmJgogCQkJ ICAgIGZjYy0+ZnVuY3Rpb25faGFuZGxlciAmJgogCQkJCSgoZmNjLT5mdW5jdGlvbl9oYW5kbGVyLT50 eXBlID09IFpFTkRfSU5URVJOQUxfRlVOQ1RJT04gJiYKQEAgLTMxMTcsNiArMzE2MCw3IEBACiAJCQl7 CiAJCQkJenZhbCAqKm1ldGhvZDsKIAkJCQl6dmFsICoqb2JqID0gTlVMTDsKKwkJCQlpbnQgc3RyaWN0 X2NsYXNzID0gMDsKCiAJCQkJaWYgKHplbmRfaGFzaF9udW1fZWxlbWVudHMoWl9BUlJWQUxfUChjYWxs YWJsZSkpID09IDIgJiYKIAkJCQkJemVuZF9oYXNoX2luZGV4X2ZpbmQoWl9BUlJWQUxfUChjYWxsYWJs ZSksIDAsICh2b2lkICoqKSAmb2JqKSA9PSBTVUNDRVNTICYmCkBAIC0zMTYwLDcgKzMyMDQsNyBAQAog CQkJCQkJCXJldHVybiAxOwogCQkJCQkJfQoKLQkJCQkJCWlmICghemVuZF9pc19jYWxsYWJsZV9jaGVj a19jbGFzcyhaX1RZUEVfUFAob2JqKSwgWl9VTklWQUxfUFAob2JqKSwgWl9VTklMRU5fUFAob2JqKSwg ZmNjLCBlcnJvciBUU1JNTFNfQ0MpKSB7CisJCQkJCQlpZiAoIXplbmRfaXNfY2FsbGFibGVfY2hlY2tf Y2xhc3MoWl9UWVBFX1BQKG9iaiksIFpfVU5JVkFMX1BQKG9iaiksIFpfVU5JTEVOX1BQKG9iaiksIGZj YywgJnN0cmljdF9jbGFzcywgZXJyb3IgVFNSTUxTX0NDKSkgewogCQkJCQkJCXJldHVybiAwOwogIAkJ CQkJCX0KIAkJCQkJfSBlbHNlIHsKQEAgLTMxOTgsNyArMzI0Miw3IEBACiAJCQkJCQl9CiAJCQkJCX0K Ci0JCQkJCXJldCA9IHplbmRfaXNfY2FsbGFibGVfY2hlY2tfZnVuYyhjaGVja19mbGFncywgKm1ldGhv ZCwgZmNjLCBlcnJvciBUU1JNTFNfQ0MpOworCQkJCQlyZXQgPSB6ZW5kX2lzX2NhbGxhYmxlX2NoZWNr X2Z1bmMoY2hlY2tfZmxhZ3MsICptZXRob2QsIGZjYywgc3RyaWN0X2NsYXNzLCBlcnJvciBUU1JNTFNf Q0MpOwogCQkJCQlpZiAoZmNjID09ICZmY2NfbG9jYWwgJiYKIAkJCQkJICAgIGZjYy0+ZnVuY3Rpb25f aGFuZGxlciAmJgogCQkJCQkJKChmY2MtPmZ1bmN0aW9uX2hhbmRsZXItPnR5cGUgPT0gWkVORF9JTlRF Uk5BTF9GVU5DVElPTiAmJgo= --4bb61218a6afb9d9db0dbbd0dfa850b094ba5944-- |
dmi...@php.net (=?utf-8?q?Dmitry_Stogov?=) 11/30/2009 11:39:53 AM |
|
It doesn't look like you meant to commit this:
--- php/php-src/branches/PHP_5_3/Zend/zend_API.c 2009-11-30 11:18:00 UTC (rev 291487) +++ php/php-src/branches/PHP_5_3/Zend/zend_API.c 2009-11-30 11:39:53 UTC (rev 291488) @@ -2117,7 +2117,7 @@ #if HAVE_LIBDL #if !(defined(NETWARE) && defined(APACHE_1_BUILD)) if (module->handle) { - DL_UNLOAD(module->handle); +// DL_UNLOAD(module->handle); } #endif #endif On 30.11.2009 14:39, Dmitry Stogov wrote: > dmitry Mon, 30 Nov 2009 11:39:53 +0000 > > Revision: http://svn.php.net/viewvc?view=revision&revision=291488 > > Log: > Fixed bug #50261 (Crash When Calling Parent Constructor with call_user_func()) > > Bug: http://bugs.php.net/50261 (Assigned) Crash When Calling Parent Constructor with call_user_func() > > Changed paths: > U php/php-src/branches/PHP_5_3/NEWS > U php/php-src/branches/PHP_5_3/Zend/zend_API.c > U php/php-src/trunk/Zend/zend_API.c > > -- Wbr, Antony Dovgal --- http://pinba.org - realtime statistics for PHP |
t...@daylessday.org (Antony Dovgal) 11/30/2009 11:59:40 AM |
|
Antony Dovgal wrote: > It doesn't look like you meant to commit this: You are right. Thanks. Dmitry. > --- php/php-src/branches/PHP_5_3/Zend/zend_API.c 2009-11-30 11:18:00 UTC (rev 291487) > +++ php/php-src/branches/PHP_5_3/Zend/zend_API.c 2009-11-30 11:39:53 UTC (rev 291488) > @@ -2117,7 +2117,7 @@ > #if HAVE_LIBDL > #if !(defined(NETWARE) && defined(APACHE_1_BUILD)) > if (module->handle) { > - DL_UNLOAD(module->handle); > +// DL_UNLOAD(module->handle); > } > #endif > #endif > > > > On 30.11.2009 14:39, Dmitry Stogov wrote: >> dmitry Mon, 30 Nov 2009 11:39:53 +0000 >> >> Revision: http://svn.php.net/viewvc?view=revision&revision=291488 >> >> Log: >> Fixed bug #50261 (Crash When Calling Parent Constructor with call_user_func()) >> >> Bug: http://bugs.php.net/50261 (Assigned) Crash When Calling Parent Constructor with call_user_func() >> >> Changed paths: >> U php/php-src/branches/PHP_5_3/NEWS >> U php/php-src/branches/PHP_5_3/Zend/zend_API.c >> U php/php-src/trunk/Zend/zend_API.c >> >> > > |
dmi...@zend.com (Dmitry Stogov) 11/30/2009 12:27:57 PM |
note 97095 added to soapclient.soapclient
note 97094 added to function.sqlite-changes
note 97093 added to function.sqlite-changes
note 97092 added to ref.xmlrpc
note 97091 added to function.var-export