[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Tue May 30 05:31:52 2006 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewcvs.cgi/php-src/ChangeLog?r1=1.2360r2=1.2361diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.2360 php-src/ChangeLog:1.2361 --- php-src/ChangeLog:1.2360Mon May 29 05:31:50 2006 +++ php-src/ChangeLog Tue May 30 05:31:51 2006 @@ -1,3 +1,114 @@ +2006-05-29 Antony Dovgal [EMAIL PROTECTED] + +* ext/pcre/php_pcre.c: + no need to check it for not-NULL (as was pointed by Nuno) + +* (PHP_5_2) + ZendEngine2/zend_compile.c: + MFH: there is no ce at this point, revert this line to its previous state + +* ZendEngine2/zend_compile.c: + there is no ce at this point, revert this line to its previous state + See also: http://news.php.net/php.zend-engine.cvs/4931 + +* (PHP_5_2) + ext/mbstring/tests/common.inc + ext/mbstring/tests/mb_strlen.phpt: + fix tests + +* (PHP_5_2) + ext/pcre/tests/invalid_utf8.phpt + ext/standard/tests/file/file_put_contents.phpt: + add test + +* ext/pcre/tests/invalid_utf8.phpt + ext/pcre/tests/invalid_utf8.phpt + ext/standard/tests/file/file_put_contents.phpt: + + add test + +* ext/pcre/php_pcre.c: + return NULL in case of error (and fix leak/non-null-terminated string + error) + +2006-05-29 Marcus Boerger [EMAIL PROTECTED] + +* (PHP_5_2) + NEWS: + - BFN + +* (PHP_5_2) + ZendEngine2/zend_compile.c + ZendEngine2/zend_object_handlers.c + ZendEngine2/tests/bug37632.phpt: + - MFH Bugfix #37632 (Protected method access problem) + +* ZendEngine2/zend_compile.c + ZendEngine2/zend_object_handlers.c + ZendEngine2/tests/bug37632.phpt + ZendEngine2/tests/bug37632.phpt: + - Bugfix #37632 (Protected method access problem) + +2006-05-29 Antony Dovgal [EMAIL PROTECTED] + +* ext/oci8/config.m4: + improve sed expressions + +2006-05-29 Michael Wallner [EMAIL PROTECTED] + +* ext/mysqli/mysqli.c + ext/mysqli/tests/bug36949.phpt: + MFB: Fixed bug #36949 (invalid internal mysqli objects dtor) + +* (PHP_5_2) + NEWS + ext/mysqli/mysqli.c + ext/mysqli/tests/bug36949.phpt + ext/mysqli/tests/bug36949.phpt: + - Fixed bug #36949 (invalid internal mysqli objects dtor) + +2006-05-29 Antony Dovgal [EMAIL PROTECTED] + +* (PHP_5_2) + NEWS: + BFN + +* (PHP_5_2) + ext/oci8/oci8.c: + MFH: fix #37531 (oci8 persistent connection corruption) + +* ext/oci8/oci8.c: + fix #37531 (oci8 persistent connection corruption) + +* (PHP_5_2) + ext/standard/tests/file/file_put_contents.phpt: + file file_put_contents.phpt was added on branch PHP_5_2 on 2006-05-29 + 10:42:54 + + +* ext/standard/file.c: + initialize srcstream + use different variable in local scope + +* (PHP_5_2) + ext/standard/file.c: + initialize srcstream + +* (PHP_5_2) + ext/standard/file.c: + MFH: prevent resource leaking when passing invalid stream resource as + second argument + +* ext/standard/file.c: + prevent resource leaking when passing invalid stream resource as second + argument + +2006-05-29 Georg Richter [EMAIL PROTECTED] + +* (PHP_5_2) + NEWS + ext/mysqli/mysqli_api.c: + Fix for bug #37620 + 2006-05-28 Johannes Schlüter [EMAIL PROTECTED] * ext/standard/string.c:
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Tue May 30 05:31:57 2006 UTC Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/viewcvs.cgi/ZendEngine2/ChangeLog?r1=1.924r2=1.925diff_format=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.924 ZendEngine2/ChangeLog:1.925 --- ZendEngine2/ChangeLog:1.924 Mon May 29 05:31:56 2006 +++ ZendEngine2/ChangeLog Tue May 30 05:31:57 2006 @@ -1,3 +1,27 @@ +2006-05-29 Antony Dovgal [EMAIL PROTECTED] + +* (PHP_5_2) + zend_compile.c: + MFH: there is no ce at this point, revert this line to its previous state + +* zend_compile.c: + there is no ce at this point, revert this line to its previous state + See also: http://news.php.net/php.zend-engine.cvs/4931 + +2006-05-29 Marcus Boerger [EMAIL PROTECTED] + +* (PHP_5_2) + zend_compile.c + zend_object_handlers.c + tests/bug37632.phpt: + - MFH Bugfix #37632 (Protected method access problem) + +* zend_compile.c + zend_object_handlers.c + tests/bug37632.phpt + tests/bug37632.phpt: + - Bugfix #37632 (Protected method access problem) + 2006-05-28 Johannes Schlüter [EMAIL PROTECTED] * zend_vm_def.h @@ -13790,7 +13814,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.924 2006/05/29 05:31:56 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.925 2006/05/30 05:31:57 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -15514,7 +15538,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.924 2006/05/29 05:31:56 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.925 2006/05/30 05:31:57 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard file.c
tony2001Mon May 29 10:24:49 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard file.c
Log:
MFH: prevent resource leaking when passing invalid stream resource as second
argument
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/file.c?r1=1.409.2.6.2.1r2=1.409.2.6.2.2diff_format=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.409.2.6.2.1
php-src/ext/standard/file.c:1.409.2.6.2.2
--- php-src/ext/standard/file.c:1.409.2.6.2.1 Sun May 14 16:06:47 2006
+++ php-src/ext/standard/file.c Mon May 29 10:24:49 2006
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: file.c,v 1.409.2.6.2.1 2006/05/14 16:06:47 iliaa Exp $ */
+/* $Id: file.c,v 1.409.2.6.2.2 2006/05/29 10:24:49 tony2001 Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -571,12 +571,17 @@
long flags = 0;
zval *zcontext = NULL;
php_stream_context *context = NULL;
+ php_stream *srcstream;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, sz/|lr!,
filename, filename_len,
data, flags, zcontext) == FAILURE) {
return;
}
+ if (Z_TYPE_P(data) == IS_RESOURCE) {
+ php_stream_from_zval(srcstream, data);
+ }
+
context = php_stream_context_from_zval(zcontext, flags
PHP_FILE_NO_DEFAULT_CONTEXT);
stream = php_stream_open_wrapper_ex(filename, (flags PHP_FILE_APPEND)
? ab : wb,
@@ -591,14 +596,8 @@
switch (Z_TYPE_P(data)) {
case IS_RESOURCE:
- {
- php_stream *srcstream;
- php_stream_from_zval(srcstream, data);
-
numbytes = php_stream_copy_to_stream(srcstream, stream,
PHP_STREAM_COPY_ALL);
-
break;
- }
case IS_NULL:
case IS_LONG:
case IS_DOUBLE:
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard file.c
tony2001Mon May 29 10:39:59 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard file.c
Log:
initialize srcstream
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/file.c?r1=1.409.2.6.2.2r2=1.409.2.6.2.3diff_format=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.409.2.6.2.2
php-src/ext/standard/file.c:1.409.2.6.2.3
--- php-src/ext/standard/file.c:1.409.2.6.2.2 Mon May 29 10:24:49 2006
+++ php-src/ext/standard/file.c Mon May 29 10:39:59 2006
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: file.c,v 1.409.2.6.2.2 2006/05/29 10:24:49 tony2001 Exp $ */
+/* $Id: file.c,v 1.409.2.6.2.3 2006/05/29 10:39:59 tony2001 Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -571,7 +571,7 @@
long flags = 0;
zval *zcontext = NULL;
php_stream_context *context = NULL;
- php_stream *srcstream;
+ php_stream *srcstream = NULL;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, sz/|lr!,
filename, filename_len,
data, flags, zcontext) == FAILURE) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard file.c
tony2001Mon May 29 10:42:10 2006 UTC
Modified files:
/php-src/ext/standard file.c
Log:
initialize srcstream
use different variable in local scope
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/file.c?r1=1.443r2=1.444diff_format=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.443 php-src/ext/standard/file.c:1.444
--- php-src/ext/standard/file.c:1.443 Mon May 29 10:23:53 2006
+++ php-src/ext/standard/file.c Mon May 29 10:42:10 2006
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: file.c,v 1.443 2006/05/29 10:23:53 tony2001 Exp $ */
+/* $Id: file.c,v 1.444 2006/05/29 10:42:10 tony2001 Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -588,7 +588,7 @@
zval *zcontext = NULL;
php_stream_context *context = NULL;
char mode[3] = { 'w', 0, 0 };
- php_stream *srcstream;
+ php_stream *srcstream = NULL;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, tz/|lr!,
filename, filename_len, filename_type,
data, flags, zcontext) == FAILURE) {
@@ -701,9 +701,9 @@
php_error_docref(NULL TSRMLS_CC,
E_WARNING, Failed to write %d characters to %s, ustrlen, filename);
numchars = -1;
} else if (numchars != ustrlen) {
- int numchars =
u_countChar32(Z_USTRVAL_P(data), numchars);
+ int written_numchars =
u_countChar32(Z_USTRVAL_P(data), numchars);
- php_error_docref(NULL TSRMLS_CC,
E_WARNING, Only %d of %d characters written, possibly out of free disk space,
numchars, ustrlen);
+ php_error_docref(NULL TSRMLS_CC,
E_WARNING, Only %d of %d characters written, possibly out of free disk space,
written_numchars, ustrlen);
numchars = -1;
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/file file_put_contents.phpt
tony2001Mon May 29 10:42:37 2006 UTC Added files: /php-src/ext/standard/tests/filefile_put_contents.phpt Log: add test http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/tests/file/file_put_contents.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/file/file_put_contents.phpt +++ php-src/ext/standard/tests/file/file_put_contents.phpt --TEST-- file_put_contents() and invalid parameters --FILE-- ?php $file = dirname(__FILE__)./file_put_contents.txt; $context = stream_context_create(); var_dump(file_put_contents($file, $context)); var_dump(file_put_contents($file, new stdClass)); $fp = fopen($file, r); var_dump(file_put_contents($file, string, 0, $fp)); @unlink($file); echo Done\n; ? --EXPECTF-- Warning: file_put_contents(): supplied resource is not a valid stream resource in %s on line %d bool(false) Warning: file_put_contents(): 2nd parameter must be non-object (for now) in %s on line %d bool(false) Warning: file_put_contents(): supplied resource is not a valid Stream-Context resource in %s on line %d int(6) Done --UEXPECTF-- Warning: file_put_contents(): supplied resource is not a valid stream resource in %s on line %d bool(false) Warning: file_put_contents(): 2nd parameter must be non-object (for now) in %s on line %d bool(false) Warning: file_put_contents(): supplied resource is not a valid Stream-Context resource in %s on line %d Notice: file_put_contents(): 6 character unicode buffer downcoded for binary stream runtime_encoding in %s on line %d int(6) Done -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/file file_put_contents.phpt
tony2001Mon May 29 10:42:54 2006 UTC Added files: (Branch: PHP_5_2) /php-src/ext/standard/tests/filefile_put_contents.phpt Log: add test http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/tests/file/file_put_contents.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/file/file_put_contents.phpt +++ php-src/ext/standard/tests/file/file_put_contents.phpt --TEST-- file_put_contents() and invalid parameters --FILE-- ?php $file = dirname(__FILE__)./file_put_contents.txt; $context = stream_context_create(); var_dump(file_put_contents($file, $context)); var_dump(file_put_contents($file, new stdClass)); $fp = fopen($file, r); var_dump(file_put_contents($file, string, 0, $fp)); @unlink($file); echo Done\n; ? --EXPECTF-- Warning: file_put_contents(): supplied resource is not a valid stream resource in %s on line %d bool(false) Warning: file_put_contents(): 2nd parameter must be non-object (for now) in %s on line %d bool(false) Warning: file_put_contents(): supplied resource is not a valid Stream-Context resource in %s on line %d int(6) Done --UEXPECTF-- Warning: file_put_contents(): supplied resource is not a valid stream resource in %s on line %d bool(false) Warning: file_put_contents(): 2nd parameter must be non-object (for now) in %s on line %d bool(false) Warning: file_put_contents(): supplied resource is not a valid Stream-Context resource in %s on line %d Notice: file_put_contents(): 6 character unicode buffer downcoded for binary stream runtime_encoding in %s on line %d int(6) Done -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/file file_put_contents.phpt
Could someone fix this damned CVS log script ? Currently it shows data from HEAD when a different data has been actually committed to a branch, which is kinda confusing. And those infamous empty log mails when somebody adds a file only to a branch.. On 29.05.2006 14:42, Antony Dovgal wrote: tony2001Mon May 29 10:42:54 2006 UTC Added files: (Branch: PHP_5_2) /php-src/ext/standard/tests/file file_put_contents.phpt Log: add test http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/tests/file/file_put_contents.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/file/file_put_contents.phpt +++ php-src/ext/standard/tests/file/file_put_contents.phpt --TEST-- file_put_contents() and invalid parameters --FILE-- ?php $file = dirname(__FILE__)./file_put_contents.txt; $context = stream_context_create(); var_dump(file_put_contents($file, $context)); var_dump(file_put_contents($file, new stdClass)); $fp = fopen($file, r); var_dump(file_put_contents($file, string, 0, $fp)); @unlink($file); echo Done\n; ? --EXPECTF-- Warning: file_put_contents(): supplied resource is not a valid stream resource in %s on line %d bool(false) Warning: file_put_contents(): 2nd parameter must be non-object (for now) in %s on line %d bool(false) Warning: file_put_contents(): supplied resource is not a valid Stream-Context resource in %s on line %d int(6) Done --UEXPECTF-- Warning: file_put_contents(): supplied resource is not a valid stream resource in %s on line %d bool(false) Warning: file_put_contents(): 2nd parameter must be non-object (for now) in %s on line %d bool(false) Warning: file_put_contents(): supplied resource is not a valid Stream-Context resource in %s on line %d Notice: file_put_contents(): 6 character unicode buffer downcoded for binary stream runtime_encoding in %s on line %d int(6) Done -- Wbr, Antony Dovgal -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/oci8 oci8.c
tony2001Mon May 29 10:59:15 2006 UTC
Modified files:
/php-src/ext/oci8 oci8.c
Log:
fix #37531 (oci8 persistent connection corruption)
http://cvs.php.net/viewcvs.cgi/php-src/ext/oci8/oci8.c?r1=1.299r2=1.300diff_format=u
Index: php-src/ext/oci8/oci8.c
diff -u php-src/ext/oci8/oci8.c:1.299 php-src/ext/oci8/oci8.c:1.300
--- php-src/ext/oci8/oci8.c:1.299 Thu May 18 13:20:00 2006
+++ php-src/ext/oci8/oci8.c Mon May 29 10:59:15 2006
@@ -26,7 +26,7 @@
+--+
*/
-/* $Id: oci8.c,v 1.299 2006/05/18 13:20:00 tony2001 Exp $ */
+/* $Id: oci8.c,v 1.300 2006/05/29 10:59:15 tony2001 Exp $ */
/* TODO
*
* file://localhost/www/docs/oci10/ociaahan.htm#423823 - implement lob_empty()
with OCI_ATTR_LOBEMPTY
@@ -647,7 +647,7 @@
php_info_print_table_start();
php_info_print_table_row(2, OCI8 Support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.299 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.300 $);
sprintf(buf, %ld, OCI_G(num_persistent));
php_info_print_table_row(2, Active Persistent Connections, buf);
@@ -1055,10 +1055,14 @@
/* server died */
}
else {
+ int rsrc_type;
+
/* okay, the connection
is open and the server is still alive */
connection-used_this_request = 1;
smart_str_free_ex(hashed_details, 0);
- if
(zend_list_addref(connection-rsrc_id) == FAILURE) {
+ if
(zend_list_find(connection-rsrc_id, rsrc_type) (rsrc_type ==
le_pconnection) zend_list_addref(connection-rsrc_id) == SUCCESS) {
+ /* do nothing */
+ } else {
connection-rsrc_id = zend_list_insert(connection, le_pconnection);
}
return connection;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/oci8 oci8.c
tony2001Mon May 29 10:59:30 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/oci8 oci8.c
Log:
MFH: fix #37531 (oci8 persistent connection corruption)
http://cvs.php.net/viewcvs.cgi/php-src/ext/oci8/oci8.c?r1=1.269.2.16.2.2r2=1.269.2.16.2.3diff_format=u
Index: php-src/ext/oci8/oci8.c
diff -u php-src/ext/oci8/oci8.c:1.269.2.16.2.2
php-src/ext/oci8/oci8.c:1.269.2.16.2.3
--- php-src/ext/oci8/oci8.c:1.269.2.16.2.2 Thu May 18 13:21:07 2006
+++ php-src/ext/oci8/oci8.c Mon May 29 10:59:30 2006
@@ -26,7 +26,7 @@
+--+
*/
-/* $Id: oci8.c,v 1.269.2.16.2.2 2006/05/18 13:21:07 tony2001 Exp $ */
+/* $Id: oci8.c,v 1.269.2.16.2.3 2006/05/29 10:59:30 tony2001 Exp $ */
/* TODO
*
* file://localhost/www/docs/oci10/ociaahan.htm#423823 - implement lob_empty()
with OCI_ATTR_LOBEMPTY
@@ -647,7 +647,7 @@
php_info_print_table_start();
php_info_print_table_row(2, OCI8 Support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.269.2.16.2.2 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.269.2.16.2.3 $);
sprintf(buf, %ld, OCI_G(num_persistent));
php_info_print_table_row(2, Active Persistent Connections, buf);
@@ -1055,10 +1055,14 @@
/* server died */
}
else {
+ int rsrc_type;
+
/* okay, the connection
is open and the server is still alive */
connection-used_this_request = 1;
smart_str_free_ex(hashed_details, 0);
- if
(zend_list_addref(connection-rsrc_id) == FAILURE) {
+ if
(zend_list_find(connection-rsrc_id, rsrc_type) (rsrc_type ==
le_pconnection) zend_list_addref(connection-rsrc_id) == SUCCESS) {
+ /* do nothing */
+ } else {
connection-rsrc_id = zend_list_insert(connection, le_pconnection);
}
return connection;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/mysqli mysqli.c /ext/mysqli/tests bug36949.phpt
mikeMon May 29 16:53:56 2006 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/mysqli/tests bug36949.phpt
Modified files:
/php-srcNEWS
/php-src/ext/mysqli mysqli.c
Log:
- Fixed bug #36949 (invalid internal mysqli objects dtor)
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.547.2.61r2=1.2027.2.547.2.62diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.61 php-src/NEWS:1.2027.2.547.2.62
--- php-src/NEWS:1.2027.2.547.2.61 Mon May 29 11:00:32 2006
+++ php-src/NEWSMon May 29 16:53:56 2006
@@ -97,6 +97,7 @@
- Fixed bug #37256 (php-fastcgi dosen't handle connection abort). (Dmitry)
- Fixed bug #37244 (Added strict flag to base64_decode() that enforces
RFC3548 compliance). (Ilia)
+- Fixed bug #36949 (invalid internal mysqli objects dtor). (Mike)
- Fixed bug #36630 (umask not reset at the end of the request). (Ilia)
- Fixed bug #35512 (Lack of read permission on main script results in
E_WARNING rather then E_ERROR). (Ilia)
http://cvs.php.net/viewcvs.cgi/php-src/ext/mysqli/mysqli.c?r1=1.72.2.16.2.3r2=1.72.2.16.2.4diff_format=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.72.2.16.2.3
php-src/ext/mysqli/mysqli.c:1.72.2.16.2.4
--- php-src/ext/mysqli/mysqli.c:1.72.2.16.2.3 Wed May 10 11:53:13 2006
+++ php-src/ext/mysqli/mysqli.c Mon May 29 16:53:56 2006
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli.c,v 1.72.2.16.2.3 2006/05/10 11:53:13 andrey Exp $
+ $Id: mysqli.c,v 1.72.2.16.2.4 2006/05/29 16:53:56 mike Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -135,22 +135,7 @@
static void mysqli_objects_free_storage(zend_object *object TSRMLS_DC)
{
mysqli_object *intern = (mysqli_object *)object;
-
- zend_object_std_dtor(intern-zo TSRMLS_CC);
- efree(intern);
-}
-/* }}} */
-
-/* {{{ mysqli_objects_destroy_object
- */
-static void mysqli_objects_destroy_object(void *object, zend_object_handle
handle TSRMLS_DC)
-{
- mysqli_object *intern = (mysqli_object *)object;
- MYSQLI_RESOURCE *my_res;
-
- zend_objects_destroy_object(object, handle TSRMLS_CC);
-
- my_res = (MYSQLI_RESOURCE *)intern-ptr;
+ MYSQLI_RESOURCE *my_res = (MYSQLI_RESOURCE *)intern-ptr;
/* link object */
if (instanceof_function(intern-zo.ce, mysqli_link_class_entry
TSRMLS_CC)) {
@@ -179,6 +164,9 @@
}
intern-ptr = NULL;
my_efree(my_res);
+
+ zend_object_std_dtor(intern-zo TSRMLS_CC);
+ efree(intern);
}
/* }}} */
@@ -360,7 +348,7 @@
zend_hash_copy(intern-zo.properties, class_type-default_properties,
(copy_ctor_func_t) zval_add_ref,
(void *) tmp, sizeof(zval *));
- retval.handle = zend_objects_store_put(intern,
(zend_objects_store_dtor_t) mysqli_objects_destroy_object,
(zend_objects_free_object_storage_t) mysqli_objects_free_storage, NULL
TSRMLS_CC);
+ retval.handle = zend_objects_store_put(intern,
(zend_objects_store_dtor_t) zend_objects_destroy_object,
(zend_objects_free_object_storage_t) mysqli_objects_free_storage, NULL
TSRMLS_CC);
retval.handlers = mysqli_object_handlers;
return retval;
http://cvs.php.net/viewcvs.cgi/php-src/ext/mysqli/tests/bug36949.phpt?view=markuprev=1.1
Index: php-src/ext/mysqli/tests/bug36949.phpt
+++ php-src/ext/mysqli/tests/bug36949.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mysqli mysqli.c /ext/mysqli/tests bug36949.phpt
mikeMon May 29 16:55:40 2006 UTC
Modified files:
/php-src/ext/mysqli mysqli.c
/php-src/ext/mysqli/tests bug36949.phpt
Log:
MFB: Fixed bug #36949 (invalid internal mysqli objects dtor)
http://cvs.php.net/viewcvs.cgi/php-src/ext/mysqli/mysqli.c?r1=1.88r2=1.89diff_format=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.88 php-src/ext/mysqli/mysqli.c:1.89
--- php-src/ext/mysqli/mysqli.c:1.88Wed May 10 12:29:09 2006
+++ php-src/ext/mysqli/mysqli.c Mon May 29 16:55:40 2006
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli.c,v 1.88 2006/05/10 12:29:09 andrey Exp $
+ $Id: mysqli.c,v 1.89 2006/05/29 16:55:40 mike Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -135,22 +135,7 @@
static void mysqli_objects_free_storage(zend_object *object TSRMLS_DC)
{
mysqli_object *intern = (mysqli_object *)object;
-
- zend_object_std_dtor(intern-zo TSRMLS_CC);
- efree(intern);
-}
-/* }}} */
-
-/* {{{ mysqli_objects_destroy_object
- */
-static void mysqli_objects_destroy_object(void *object, zend_object_handle
handle TSRMLS_DC)
-{
- mysqli_object *intern = (mysqli_object *)object;
- MYSQLI_RESOURCE *my_res;
-
- zend_objects_destroy_object(object, handle TSRMLS_CC);
-
- my_res = (MYSQLI_RESOURCE *)intern-ptr;
+ MYSQLI_RESOURCE *my_res = (MYSQLI_RESOURCE *)intern-ptr;
/* link object */
if (instanceof_function(intern-zo.ce, mysqli_link_class_entry
TSRMLS_CC)) {
@@ -179,6 +164,9 @@
}
intern-ptr = NULL;
my_efree(my_res);
+
+ zend_object_std_dtor(intern-zo TSRMLS_CC);
+ efree(intern);
}
/* }}} */
@@ -361,7 +349,7 @@
zend_hash_copy(intern-zo.properties, class_type-default_properties,
(copy_ctor_func_t) zval_add_ref,
(void *) tmp, sizeof(zval *));
- retval.handle = zend_objects_store_put(intern,
(zend_objects_store_dtor_t) mysqli_objects_destroy_object,
(zend_objects_free_object_storage_t) mysqli_objects_free_storage, NULL
TSRMLS_CC);
+ retval.handle = zend_objects_store_put(intern,
(zend_objects_store_dtor_t) zend_objects_destroy_object,
(zend_objects_free_object_storage_t) mysqli_objects_free_storage, NULL
TSRMLS_CC);
retval.handlers = mysqli_object_handlers;
return retval;
http://cvs.php.net/viewcvs.cgi/php-src/ext/mysqli/tests/bug36949.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/mysqli/tests/bug36949.phpt
diff -u /dev/null php-src/ext/mysqli/tests/bug36949.phpt:1.2
--- /dev/null Mon May 29 16:55:40 2006
+++ php-src/ext/mysqli/tests/bug36949.phpt Mon May 29 16:55:40 2006
@@ -0,0 +1,50 @@
+--TEST--
+bug #36949
+--SKIPIF--
+?php require_once('skipif.inc'); ?
+--FILE--
+?php
+include connect.inc;
+
+class A {
+
+ private $mysqli;
+
+ public function __construct() {
+ global $user, $host, $passwd;
+ $this-mysqli = new mysqli($host, $user, $passwd);
+ $result = $this-mysqli-query(SELECT NOW() AS my_time FROM
DUAL);
+ $row = $result-fetch_object();
+ echo $row-my_time.br\n;
+ $result-close();
+ }
+
+ public function __destruct() {
+ $this-mysqli-close();
+ }
+}
+
+class B {
+
+ private $mysqli;
+
+ public function __construct() {
+ global $user, $host, $passwd;
+ $this-mysqli = new mysqli($host, $user, $passwd);
+ $result = $this-mysqli-query(SELECT NOW() AS my_time FROM
DUAL);
+ $row = $result-fetch_object();
+ echo $row-my_time.br\n;
+ $result-close();
+ }
+
+ public function __destruct() {
+ $this-mysqli-close();
+ }
+}
+
+$A = new A();
+$B = new B();
+?
+--EXPECTF--
+%d%d%d%d-%d%d-%d%d %d%d:%d%d:%d%dbr
+%d%d%d%d-%d%d-%d%d %d%d:%d%d:%d%dbr
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/oci8 config.m4
tony2001Mon May 29 18:12:39 2006 UTC Modified files: /php-src/ext/oci8 config.m4 Log: improve sed expressions http://cvs.php.net/viewcvs.cgi/php-src/ext/oci8/config.m4?r1=1.59r2=1.60diff_format=u Index: php-src/ext/oci8/config.m4 diff -u php-src/ext/oci8/config.m4:1.59 php-src/ext/oci8/config.m4:1.60 --- php-src/ext/oci8/config.m4:1.59 Wed Apr 5 14:07:16 2006 +++ php-src/ext/oci8/config.m4 Mon May 29 18:12:39 2006 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.59 2006/04/05 14:07:16 tony2001 Exp $ +dnl $Id: config.m4,v 1.60 2006/05/29 18:12:39 tony2001 Exp $ dnl if test -z $SED; then @@ -316,13 +316,13 @@ AC_MSG_CHECKING([Oracle Instant Client SDK header directory]) dnl Header directory for Instant Client SDK RPM install - OCISDKRPMINC=`echo $PHP_OCI8_INSTANT_CLIENT | $PHP_OCI8_SED -e 's!^/usr/lib/oracle/\(.*\)/client/lib[[/]]*$!/usr/include/oracle/\1/client!'` + OCISDKRPMINC=`echo $PHP_OCI8_INSTANT_CLIENT | $PHP_OCI8_SED -e 's!^/usr/lib/oracle/\(.*\)/client/lib[/]*$!/usr/include/oracle/\1/client!'` dnl Header directory for Instant Client SDK zip file install OCISDKZIPINC=$PHP_OCI8_INSTANT_CLIENT/sdk/include dnl Header directory for manual installation - OCISDKMANINC=`echo $PHP_OCI8_INSTANT_CLIENT | $PHP_OCI8_SED -e 's!\(.*\)/lib[[/]]*$!\1/include!'` + OCISDKMANINC=`echo $PHP_OCI8_INSTANT_CLIENT | $PHP_OCI8_SED -e 's!\(.*\)/lib[/]*$!\1/include!'` if test -f $OCISDKRPMINC/oci.h; then AC_MSG_RESULT($OCISDKRPMINC) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/oci8 config.m4
tony2001Mon May 29 18:12:55 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/oci8 config.m4 Log: MFH: improve sed expressions http://cvs.php.net/viewcvs.cgi/php-src/ext/oci8/config.m4?r1=1.55.2.3r2=1.55.2.3.2.1diff_format=u Index: php-src/ext/oci8/config.m4 diff -u php-src/ext/oci8/config.m4:1.55.2.3 php-src/ext/oci8/config.m4:1.55.2.3.2.1 --- php-src/ext/oci8/config.m4:1.55.2.3 Wed Apr 5 14:06:00 2006 +++ php-src/ext/oci8/config.m4 Mon May 29 18:12:55 2006 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.55.2.3 2006/04/05 14:06:00 tony2001 Exp $ +dnl $Id: config.m4,v 1.55.2.3.2.1 2006/05/29 18:12:55 tony2001 Exp $ dnl if test -z $SED; then @@ -316,13 +316,13 @@ AC_MSG_CHECKING([Oracle Instant Client SDK header directory]) dnl Header directory for Instant Client SDK RPM install - OCISDKRPMINC=`echo $PHP_OCI8_INSTANT_CLIENT | $PHP_OCI8_SED -e 's!^/usr/lib/oracle/\(.*\)/client/lib[[/]]*$!/usr/include/oracle/\1/client!'` + OCISDKRPMINC=`echo $PHP_OCI8_INSTANT_CLIENT | $PHP_OCI8_SED -e 's!^/usr/lib/oracle/\(.*\)/client/lib[/]*$!/usr/include/oracle/\1/client!'` dnl Header directory for Instant Client SDK zip file install OCISDKZIPINC=$PHP_OCI8_INSTANT_CLIENT/sdk/include dnl Header directory for manual installation - OCISDKMANINC=`echo $PHP_OCI8_INSTANT_CLIENT | $PHP_OCI8_SED -e 's!\(.*\)/lib[[/]]*$!\1/include!'` + OCISDKMANINC=`echo $PHP_OCI8_INSTANT_CLIENT | $PHP_OCI8_SED -e 's!\(.*\)/lib[/]*$!\1/include!'` if test -f $OCISDKRPMINC/oci.h; then AC_MSG_RESULT($OCISDKRPMINC) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/file file_put_contents.phpt
Hello Antony, i have a different set of scripts based on Ken Coar's that work perfectly at my office. But Rasmus had problems setting them up. So i am not sure it is a good idea to install them and try a bit until the issues are solved. For example we should block access to all but a test repository/module during that time. best regards marcus Monday, May 29, 2006, 12:50:19 PM, you wrote: Could someone fix this damned CVS log script ? Currently it shows data from HEAD when a different data has been actually committed to a branch, which is kinda confusing. And those infamous empty log mails when somebody adds a file only to a branch.. On 29.05.2006 14:42, Antony Dovgal wrote: tony2001 Mon May 29 10:42:54 2006 UTC Added files: (Branch: PHP_5_2) /php-src/ext/standard/tests/file file_put_contents.phpt Log: add test http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/tests/file/file_put_contents.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/file/file_put_contents.phpt +++ php-src/ext/standard/tests/file/file_put_contents.phpt --TEST-- file_put_contents() and invalid parameters --FILE-- ?php $file = dirname(__FILE__)./file_put_contents.txt; $context = stream_context_create(); var_dump(file_put_contents($file, $context)); var_dump(file_put_contents($file, new stdClass)); $fp = fopen($file, r); var_dump(file_put_contents($file, string, 0, $fp)); @unlink($file); echo Done\n; ? --EXPECTF-- Warning: file_put_contents(): supplied resource is not a valid stream resource in %s on line %d bool(false) Warning: file_put_contents(): 2nd parameter must be non-object (for now) in %s on line %d bool(false) Warning: file_put_contents(): supplied resource is not a valid Stream-Context resource in %s on line %d int(6) Done --UEXPECTF-- Warning: file_put_contents(): supplied resource is not a valid stream resource in %s on line %d bool(false) Warning: file_put_contents(): 2nd parameter must be non-object (for now) in %s on line %d bool(false) Warning: file_put_contents(): supplied resource is not a valid Stream-Context resource in %s on line %d Notice: file_put_contents(): 6 character unicode buffer downcoded for binary stream runtime_encoding in %s on line %d int(6) Done -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS
helly Mon May 29 20:07:40 2006 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: - BFN http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.547.2.62r2=1.2027.2.547.2.63diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.62 php-src/NEWS:1.2027.2.547.2.63 --- php-src/NEWS:1.2027.2.547.2.62 Mon May 29 16:53:56 2006 +++ php-src/NEWSMon May 29 20:07:39 2006 @@ -47,6 +47,7 @@ - Added RFC2397 (data: stream) support. (Marcus) - Fixed memory leaks in openssl streams context options (Pierre) - Fixed handling of extremely long paths inside tempnam() function. (Ilia) +- Fixed bug #37632 (Protected method access problem). (Marcus) - Fixed bug #37620 (mysqli_ssl_set validation is innappropriate). (Georg) - Fixed bug #37614 (Class name lowercased in error message). (Johannes) - Fixed bug #37587 (var without attribute causes segfault). (Marcus) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pcre php_pcre.c
tony2001Mon May 29 20:26:12 2006 UTC
Modified files:
/php-src/ext/pcre php_pcre.c
Log:
return NULL in case of error (and fix leak/non-null-terminated string error)
http://cvs.php.net/viewcvs.cgi/php-src/ext/pcre/php_pcre.c?r1=1.181r2=1.182diff_format=u
Index: php-src/ext/pcre/php_pcre.c
diff -u php-src/ext/pcre/php_pcre.c:1.181 php-src/ext/pcre/php_pcre.c:1.182
--- php-src/ext/pcre/php_pcre.c:1.181 Tue May 9 18:28:11 2006
+++ php-src/ext/pcre/php_pcre.c Mon May 29 20:26:12 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_pcre.c,v 1.181 2006/05/09 18:28:11 andrei Exp $ */
+/* $Id: php_pcre.c,v 1.182 2006/05/29 20:26:12 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1115,6 +1115,10 @@
}
} else {
pcre_handle_exec_error(count TSRMLS_CC);
+ if (result) {
+ efree(result);
+ result = NULL;
+ }
break;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/pcre php_pcre.c
tony2001Mon May 29 20:26:32 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/pcre php_pcre.c
Log:
MFH: return NULL in case of error
http://cvs.php.net/viewcvs.cgi/php-src/ext/pcre/php_pcre.c?r1=1.168.2.9.2.2r2=1.168.2.9.2.3diff_format=u
Index: php-src/ext/pcre/php_pcre.c
diff -u php-src/ext/pcre/php_pcre.c:1.168.2.9.2.2
php-src/ext/pcre/php_pcre.c:1.168.2.9.2.3
--- php-src/ext/pcre/php_pcre.c:1.168.2.9.2.2 Tue May 9 23:53:40 2006
+++ php-src/ext/pcre/php_pcre.c Mon May 29 20:26:32 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_pcre.c,v 1.168.2.9.2.2 2006/05/09 23:53:40 helly Exp $ */
+/* $Id: php_pcre.c,v 1.168.2.9.2.3 2006/05/29 20:26:32 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1115,6 +1115,10 @@
}
} else {
pcre_handle_exec_error(count TSRMLS_CC);
+ if (result) {
+ efree(result);
+ result = NULL;
+ }
break;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pcre/tests invalid_utf8.phpt
tony2001Mon May 29 20:31:33 2006 UTC Added files: /php-src/ext/pcre/tests invalid_utf8.phpt Log: add test http://cvs.php.net/viewcvs.cgi/php-src/ext/pcre/tests/invalid_utf8.phpt?view=markuprev=1.1 Index: php-src/ext/pcre/tests/invalid_utf8.phpt +++ php-src/ext/pcre/tests/invalid_utf8.phpt --TEST-- preg_replace() and invalid UTF8 --FILE-- ?php $string = urldecode(search%e4); $result = preg_replace(#(\#x*)([0-9A-F]+);*#iu,$1$2;,$string); var_dump($result); var_dump(preg_last_error()); echo Done\n; ? --EXPECT-- NULL int(4) Done -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/pcre/tests invalid_utf8.phpt
tony2001Mon May 29 20:31:48 2006 UTC Added files: (Branch: PHP_5_2) /php-src/ext/pcre/tests invalid_utf8.phpt Log: add test http://cvs.php.net/viewcvs.cgi/php-src/ext/pcre/tests/invalid_utf8.phpt?view=markuprev=1.1 Index: php-src/ext/pcre/tests/invalid_utf8.phpt +++ php-src/ext/pcre/tests/invalid_utf8.phpt --TEST-- preg_replace() and invalid UTF8 --FILE-- ?php $string = urldecode(search%e4); $result = preg_replace(#(\#x*)([0-9A-F]+);*#iu,$1$2;,$string); var_dump($result); var_dump(preg_last_error()); echo Done\n; ? --EXPECT-- NULL int(4) Done -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/mbstring/tests common.inc mb_strlen.phpt
tony2001Mon May 29 21:08:02 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/mbstring/tests common.inc mb_strlen.phpt
Log:
fix tests
http://cvs.php.net/viewcvs.cgi/php-src/ext/mbstring/tests/common.inc?r1=1.2r2=1.2.6.1diff_format=u
Index: php-src/ext/mbstring/tests/common.inc
diff -u php-src/ext/mbstring/tests/common.inc:1.2
php-src/ext/mbstring/tests/common.inc:1.2.6.1
--- php-src/ext/mbstring/tests/common.inc:1.2 Sun Nov 30 13:20:26 2003
+++ php-src/ext/mbstring/tests/common.inc Mon May 29 21:08:02 2006
@@ -18,7 +18,9 @@
128 = Compile Warning, //
E_COMPILE_WARNING
256 = User Error,// E_USER_ERROR
512 = User Warning, //
E_USER_WARMING
- 1024= User Notice// E_USER_NOTICE
+ 1024= User Notice, // E_USER_NOTICE
+ 2048= Strict Notice, // E_STRICT
+ 4096= Catchable fatal error, //
E_RECOVERABLE_ERROR
);
if (!empty($debug)) {
@@ -50,4 +52,4 @@
$t_obj = new tc;
-?
\ No newline at end of file
+?
http://cvs.php.net/viewcvs.cgi/php-src/ext/mbstring/tests/mb_strlen.phpt?r1=1.3r2=1.3.6.1diff_format=u
Index: php-src/ext/mbstring/tests/mb_strlen.phpt
diff -u php-src/ext/mbstring/tests/mb_strlen.phpt:1.3
php-src/ext/mbstring/tests/mb_strlen.phpt:1.3.6.1
--- php-src/ext/mbstring/tests/mb_strlen.phpt:1.3 Mon Jan 19 16:53:34 2004
+++ php-src/ext/mbstring/tests/mb_strlen.phpt Mon May 29 21:08:02 2006
@@ -98,6 +98,7 @@
== WRONG PARAMETERS ==
ERR: Notice
5
+ERR: Catchable fatal error
ERR: Notice
6
ERR: Warning
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/pcre php_pcre.c
@@ -1115,6 +1115,10 @@
}
} else {
pcre_handle_exec_error(count TSRMLS_CC);
+ if (result) {
+ efree(result);
+ result = NULL;
+ }
break;
}
Nice catch, Tony! But you don't need the if, because result is never NULL
(it is assigned only from safe_malloc()).
Nuno
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pcre php_pcre.c
tony2001Mon May 29 21:31:30 2006 UTC
Modified files:
/php-src/ext/pcre php_pcre.c
Log:
no need to check it for not-NULL (as was pointed by Nuno)
http://cvs.php.net/viewcvs.cgi/php-src/ext/pcre/php_pcre.c?r1=1.182r2=1.183diff_format=u
Index: php-src/ext/pcre/php_pcre.c
diff -u php-src/ext/pcre/php_pcre.c:1.182 php-src/ext/pcre/php_pcre.c:1.183
--- php-src/ext/pcre/php_pcre.c:1.182 Mon May 29 20:26:12 2006
+++ php-src/ext/pcre/php_pcre.c Mon May 29 21:31:30 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_pcre.c,v 1.182 2006/05/29 20:26:12 tony2001 Exp $ */
+/* $Id: php_pcre.c,v 1.183 2006/05/29 21:31:30 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1115,10 +1115,8 @@
}
} else {
pcre_handle_exec_error(count TSRMLS_CC);
- if (result) {
- efree(result);
- result = NULL;
- }
+ efree(result);
+ result = NULL;
break;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/pcre php_pcre.c
tony2001Mon May 29 21:31:49 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/pcre php_pcre.c
Log:
MFH: no need to check it for not-NULL
http://cvs.php.net/viewcvs.cgi/php-src/ext/pcre/php_pcre.c?r1=1.168.2.9.2.3r2=1.168.2.9.2.4diff_format=u
Index: php-src/ext/pcre/php_pcre.c
diff -u php-src/ext/pcre/php_pcre.c:1.168.2.9.2.3
php-src/ext/pcre/php_pcre.c:1.168.2.9.2.4
--- php-src/ext/pcre/php_pcre.c:1.168.2.9.2.3 Mon May 29 20:26:32 2006
+++ php-src/ext/pcre/php_pcre.c Mon May 29 21:31:49 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_pcre.c,v 1.168.2.9.2.3 2006/05/29 20:26:32 tony2001 Exp $ */
+/* $Id: php_pcre.c,v 1.168.2.9.2.4 2006/05/29 21:31:49 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1115,10 +1115,8 @@
}
} else {
pcre_handle_exec_error(count TSRMLS_CC);
- if (result) {
- efree(result);
- result = NULL;
- }
+ efree(result);
+ result = NULL;
break;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/pcre php_pcre.c
On 30.05.2006 01:11, Nuno Lopes wrote:
@@ -1115,6 +1115,10 @@
}
} else {
pcre_handle_exec_error(count TSRMLS_CC);
+ if (result) {
+ efree(result);
+ result = NULL;
+ }
break;
}
Nice catch, Tony! But you don't need the if, because result is never NULL
(it is assigned only from safe_malloc()).
It has been caught by Johannes actually.
Thanks for the hint.
--
Wbr,
Antony Dovgal
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/wddx wddx.c
iliaa Tue May 30 02:40:33 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/wddx wddx.c
Log:
Convert E_ERROR to E_RECOVERABLE_ERROR
http://cvs.php.net/viewcvs.cgi/php-src/ext/wddx/wddx.c?r1=1.119.2.10.2.2r2=1.119.2.10.2.3diff_format=u
Index: php-src/ext/wddx/wddx.c
diff -u php-src/ext/wddx/wddx.c:1.119.2.10.2.2
php-src/ext/wddx/wddx.c:1.119.2.10.2.3
--- php-src/ext/wddx/wddx.c:1.119.2.10.2.2 Thu May 25 22:54:16 2006
+++ php-src/ext/wddx/wddx.c Tue May 30 02:40:33 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: wddx.c,v 1.119.2.10.2.2 2006/05/25 22:54:16 iliaa Exp $ */
+/* $Id: wddx.c,v 1.119.2.10.2.3 2006/05/30 02:40:33 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -657,7 +657,7 @@
case IS_ARRAY:
ht = Z_ARRVAL_P(var);
if (ht-nApplyCount 1) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, WDDX
doesn't support circular references);
+ php_error_docref(NULL TSRMLS_CC,
E_RECOVERABLE_ERROR, WDDX doesn't support circular references);
return;
}
ht-nApplyCount++;
@@ -668,7 +668,7 @@
case IS_OBJECT:
ht = Z_OBJPROP_P(var);
if (ht-nApplyCount 1) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, WDDX
doesn't support circular references);
+ php_error_docref(NULL TSRMLS_CC,
E_RECOVERABLE_ERROR, WDDX doesn't support circular references);
return;
}
ht-nApplyCount++;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/wddx wddx.c
iliaa Tue May 30 02:40:49 2006 UTC
Modified files:
/php-src/ext/wddx wddx.c
Log:
MFB: Convert E_ERROR to E_RECOVERABLE_ERROR
http://cvs.php.net/viewcvs.cgi/php-src/ext/wddx/wddx.c?r1=1.135r2=1.136diff_format=u
Index: php-src/ext/wddx/wddx.c
diff -u php-src/ext/wddx/wddx.c:1.135 php-src/ext/wddx/wddx.c:1.136
--- php-src/ext/wddx/wddx.c:1.135 Fri May 26 01:55:00 2006
+++ php-src/ext/wddx/wddx.c Tue May 30 02:40:49 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: wddx.c,v 1.135 2006/05/26 01:55:00 iliaa Exp $ */
+/* $Id: wddx.c,v 1.136 2006/05/30 02:40:49 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -658,7 +658,7 @@
case IS_ARRAY:
ht = Z_ARRVAL_P(var);
if (ht-nApplyCount 1) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, WDDX
doesn't support circular references);
+ php_error_docref(NULL TSRMLS_CC,
E_RECOVERABLE_ERROR, WDDX doesn't support circular references);
return;
}
ht-nApplyCount++;
@@ -669,7 +669,7 @@
case IS_OBJECT:
ht = Z_OBJPROP_P(var);
if (ht-nApplyCount 1) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, WDDX
doesn't support circular references);
+ php_error_docref(NULL TSRMLS_CC,
E_RECOVERABLE_ERROR, WDDX doesn't support circular references);
return;
}
ht-nApplyCount++;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
