https://www.mediawiki.org/wiki/Special:Code/MediaWiki/103445
Revision: 103445
Author: tstarling
Date: 2011-11-17 06:25:00 +0000 (Thu, 17 Nov 2011)
Log Message:
-----------
Fix for r83519: adjust the string length after concatenation so that the
newline is actually sent
Modified Paths:
--------------
trunk/php/wmerrors/wmerrors.c
Modified: trunk/php/wmerrors/wmerrors.c
===================================================================
--- trunk/php/wmerrors/wmerrors.c 2011-11-17 05:29:01 UTC (rev 103444)
+++ trunk/php/wmerrors/wmerrors.c 2011-11-17 06:25:00 UTC (rev 103445)
@@ -379,6 +379,7 @@
WMERRORS_G(recursion_guard) = 2;
Z_STRVAL_P(trace) = erealloc( Z_STRVAL_P(trace),
Z_STRLEN_P(trace)+sizeof(PHP_EOL) );
memcpy(Z_STRVAL_P(trace) + Z_STRLEN_P(trace), PHP_EOL, sizeof(PHP_EOL));
+ Z_STRLEN_P(trace) += sizeof(PHP_EOL) - 1; /* minus one for null */
php_stream_write(logfile_stream, Z_STRVAL_P(trace), Z_STRLEN_P(trace)
TSRMLS_CC);
WMERRORS_G(recursion_guard) = 1;
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
