iliaa Wed, 02 Sep 2009 13:07:44 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=287968
Log:
Fixed return value to comply with tests
Changed paths:
U php/php-src/branches/PHP_5_2/ext/xsl/xsltprocessor.c
U php/php-src/branches/PHP_5_3/ext/xsl/xsltprocessor.c
U php/php-src/trunk/ext/xsl/xsltprocessor.c
Modified: php/php-src/branches/PHP_5_2/ext/xsl/xsltprocessor.c
===================================================================
--- php/php-src/branches/PHP_5_2/ext/xsl/xsltprocessor.c 2009-09-02
12:07:00 UTC (rev 287967)
+++ php/php-src/branches/PHP_5_2/ext/xsl/xsltprocessor.c 2009-09-02
13:07:44 UTC (rev 287968)
@@ -666,7 +666,7 @@
ret = -1;
if (newdocp) {
ret = xsltSaveResultToString(&doc_txt_ptr, &doc_txt_len,
newdocp, sheetp);
- if (doc_txt_ptr) {
+ if (doc_txt_ptr && doc_txt_len) {
RETVAL_STRINGL(doc_txt_ptr, doc_txt_len, 1);
xmlFree(doc_txt_ptr);
}
Modified: php/php-src/branches/PHP_5_3/ext/xsl/xsltprocessor.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/xsl/xsltprocessor.c 2009-09-02
12:07:00 UTC (rev 287967)
+++ php/php-src/branches/PHP_5_3/ext/xsl/xsltprocessor.c 2009-09-02
13:07:44 UTC (rev 287968)
@@ -675,7 +675,7 @@
ret = -1;
if (newdocp) {
ret = xsltSaveResultToString(&doc_txt_ptr, &doc_txt_len,
newdocp, sheetp);
- if (doc_txt_ptr) {
+ if (doc_txt_ptr && doc_txt_len) {
RETVAL_STRINGL(doc_txt_ptr, doc_txt_len, 1);
xmlFree(doc_txt_ptr);
}
Modified: php/php-src/trunk/ext/xsl/xsltprocessor.c
===================================================================
--- php/php-src/trunk/ext/xsl/xsltprocessor.c 2009-09-02 12:07:00 UTC (rev
287967)
+++ php/php-src/trunk/ext/xsl/xsltprocessor.c 2009-09-02 13:07:44 UTC (rev
287968)
@@ -687,7 +687,7 @@
ret = -1;
if (newdocp) {
ret = xsltSaveResultToString(&doc_txt_ptr, &doc_txt_len,
newdocp, sheetp);
- if (doc_txt_ptr) {
+ if (doc_txt_ptr && doc_txt_len) {
RETVAL_STRINGL(doc_txt_ptr, doc_txt_len, 1);
xmlFree(doc_txt_ptr);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php