subject:"\[PHP\-CVS\] cvs\: php\-src\(PHP_5_2\) \/ NEWS \/ext\/xmlwriter php

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/xmlwriter php_xmlwriter.c

2009-05-11 Thread Ilia Alshanetsky

iliaa   Mon May 11 12:35:05 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/xmlwriter  php_xmlwriter.c 
/php-srcNEWS 
  Log:
  MFB: Fixed bug #48204 (xmlwriter_open_uri() does not emit warnings on invalid 
 
paths)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlwriter/php_xmlwriter.c?r1=1.20.2.12.2.20&r2=1.20.2.12.2.21&diff_format=u
Index: php-src/ext/xmlwriter/php_xmlwriter.c
diff -u php-src/ext/xmlwriter/php_xmlwriter.c:1.20.2.12.2.20 
php-src/ext/xmlwriter/php_xmlwriter.c:1.20.2.12.2.21
--- php-src/ext/xmlwriter/php_xmlwriter.c:1.20.2.12.2.20Wed Dec 31 
11:17:47 2008
+++ php-src/ext/xmlwriter/php_xmlwriter.c   Mon May 11 12:35:00 2009
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: php_xmlwriter.c,v 1.20.2.12.2.20 2008/12/31 11:17:47 sebastian Exp $ */
+/* $Id: php_xmlwriter.c,v 1.20.2.12.2.21 2009/05/11 12:35:00 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1451,6 +1451,7 @@
 
valid_file = _xmlwriter_get_valid_file_path(source, resolved_path, 
MAXPATHLEN TSRMLS_CC);
if (!valid_file) {
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to resolve 
file path");
RETURN_FALSE;
}
 
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1497&r2=1.2027.2.547.2.1498&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1497 php-src/NEWS:1.2027.2.547.2.1498
--- php-src/NEWS:1.2027.2.547.2.1497Sun May 10 16:45:01 2009
+++ php-src/NEWSMon May 11 12:35:00 2009
@@ -16,6 +16,8 @@
 - Fixed bug #48221 (memory leak when passing invalid xslt parameter). (Felipe)
 - Fixed bug #48206 (Iterating over an invalid data structure
   with RecursiveIteratorIterator leads to a segfault). (Scott)
+- Fixed bug #48204 (xmlwriter_open_uri() does not emit warnings on invalid
+  paths). (Ilia)
 - Fixed bug #48156 (Added support for lcov v1.7). (Ilia)
 - Fixed bug #48131 (Don't try to bind ipv4 addresses to ipv6 ips via
   bindto). (Ilia)



-- 
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/xmlwriter php_xmlwriter.c

2008-12-18 Thread Ilia Alshanetsky

iliaa   Thu Dec 18 20:08:01 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/xmlwriter  php_xmlwriter.c 
/php-srcNEWS 
  Log:
  
  MFB: Fixed bug #46887 (Invalid calls to php_error_docref())
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlwriter/php_xmlwriter.c?r1=1.20.2.12.2.18&r2=1.20.2.12.2.19&diff_format=u
Index: php-src/ext/xmlwriter/php_xmlwriter.c
diff -u php-src/ext/xmlwriter/php_xmlwriter.c:1.20.2.12.2.18 
php-src/ext/xmlwriter/php_xmlwriter.c:1.20.2.12.2.19
--- php-src/ext/xmlwriter/php_xmlwriter.c:1.20.2.12.2.18Tue Oct  7 
14:35:04 2008
+++ php-src/ext/xmlwriter/php_xmlwriter.c   Thu Dec 18 20:08:00 2008
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: php_xmlwriter.c,v 1.20.2.12.2.18 2008/10/07 14:35:04 iliaa Exp $ */
+/* $Id: php_xmlwriter.c,v 1.20.2.12.2.19 2008/12/18 20:08:00 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -168,7 +168,7 @@
 
 #define XMLW_NAME_CHK(__err) \
if (xmlValidateName((xmlChar *) name, 0) != 0) {\
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, __err); \
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", __err);   
\
RETURN_FALSE;   \
}   \
 
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1364&r2=1.2027.2.547.2.1365&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1364 php-src/NEWS:1.2027.2.547.2.1365
--- php-src/NEWS:1.2027.2.547.2.1364Thu Dec 18 14:56:45 2008
+++ php-src/NEWSThu Dec 18 20:08:00 2008
@@ -6,7 +6,9 @@
 - Fixed security issue in imagerotate(), background colour isn't validated
   correctly with a non truecolour image. (Fixes CVE-2008-5498) (Scott)
 
-- Fixed bug #46889: Memory leak in strtotime(). (Derick)
+- Fixed bug #46889 (Memory leak in strtotime()). (Derick)
+- Fixed bug #46887 (Invalid calls to php_error_docref()).
+  (oeriksson at mandriva dot com, Ilia)
 - Fixed bug #46798 (Crash in mssql extension when retrieving a NULL value
   inside a binary or image column type). (Ilia)
 - Fixed bug #46782 (fastcgi.c parse error). (Matt)



-- 
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/xmlwriter php_xmlwriter.c

2007-10-24 Thread Ilia Alshanetsky

iliaa   Wed Oct 24 22:50:20 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/xmlwriter  php_xmlwriter.c 
/php-srcNEWS 
  Log:
  
  MFB: Fixed bug #43099 (XMLWriter::endElement() does not check # of params)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlwriter/php_xmlwriter.c?r1=1.20.2.12.2.15&r2=1.20.2.12.2.16&diff_format=u
Index: php-src/ext/xmlwriter/php_xmlwriter.c
diff -u php-src/ext/xmlwriter/php_xmlwriter.c:1.20.2.12.2.15 
php-src/ext/xmlwriter/php_xmlwriter.c:1.20.2.12.2.16
--- php-src/ext/xmlwriter/php_xmlwriter.c:1.20.2.12.2.15Mon May 14 
09:23:49 2007
+++ php-src/ext/xmlwriter/php_xmlwriter.c   Wed Oct 24 22:50:19 2007
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: php_xmlwriter.c,v 1.20.2.12.2.15 2007/05/14 09:23:49 pajoye Exp $ */
+/* $Id: php_xmlwriter.c,v 1.20.2.12.2.16 2007/10/24 22:50:19 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -464,6 +464,9 @@

if (this) {
XMLWRITER_FROM_OBJECT(intern, this);
+   if (ZEND_NUM_ARGS()) {
+   WRONG_PARAM_COUNT;
+   }
} else 
 #endif
{
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.985&r2=1.2027.2.547.2.986&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.985 php-src/NEWS:1.2027.2.547.2.986
--- php-src/NEWS:1.2027.2.547.2.985 Mon Oct 22 22:43:44 2007
+++ php-src/NEWSWed Oct 24 22:50:19 2007
@@ -37,6 +37,8 @@
 - Fixed htmlentities/htmlspecialchars not to accept partial multibyte
   sequences. (Stas)
 
+- Fixed bug #43099 (XMLWriter::endElement() does not check # of params).
+  (Ilia)
 - Fixed bug #43020 (Warning message is missing with shuffle() and more
   than one argument). (Scott)
 - Fixed bug #4294 (Move *timeout initialization from RINIT to connect time).

-- 
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) / NEWS /ext/xmlwriter php_xmlwriter.c /ext/xmlwriter/tests bug41287.phpt bug41326.phpt

2007-05-08 Thread Antony Dovgal


CCing phpdocs.

On 05/09/2007 01:41 AM, Pierre-Alain Joye wrote:

pajoye  Tue May  8 21:41:36 2007 UTC

  Added files: (Branch: PHP_5_2)
/php-src/ext/xmlwriter/tests	bug41326.phpt 

  Modified files:  
/php-src	NEWS 
/php-src/ext/xmlwriter	php_xmlwriter.c 
/php-src/ext/xmlwriter/tests	bug41287.phpt 
  Log:

  - MFH: #41326, Writing empty tags with Xmlwriter::WriteElement[ns]
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.689&r2=1.2027.2.547.2.690&diff_format=u

Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.689 php-src/NEWS:1.2027.2.547.2.690
--- php-src/NEWS:1.2027.2.547.2.689 Tue May  8 18:38:20 2007
+++ php-src/NEWSTue May  8 21:41:36 2007
@@ -7,6 +7,8 @@
   (Ilia)
 - Fixed altering $this via argument named "this". (Dmitry)
 - Fixed PHP CLI to use the php.ini from the binary location. (Hannes)
+- Fixed bug #41326 (Writing empty tags with Xmlwriter::WriteElement[ns])
+  (Pierre)
 - Fixed bug #41321 (downgrade read errors in getimagesize() to E_NOTICE).
   (Ilia)
 - Fixed bug #41304 (compress.zlib temp files left). (Dmitry)
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlwriter/php_xmlwriter.c?r1=1.20.2.12.2.13&r2=1.20.2.12.2.14&diff_format=u
Index: php-src/ext/xmlwriter/php_xmlwriter.c
diff -u php-src/ext/xmlwriter/php_xmlwriter.c:1.20.2.12.2.13 
php-src/ext/xmlwriter/php_xmlwriter.c:1.20.2.12.2.14
--- php-src/ext/xmlwriter/php_xmlwriter.c:1.20.2.12.2.13Fri May  4 
20:16:39 2007
+++ php-src/ext/xmlwriter/php_xmlwriter.c   Tue May  8 21:41:36 2007
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: php_xmlwriter.c,v 1.20.2.12.2.13 2007/05/04 20:16:39 rrichards Exp $ */

+/* $Id: php_xmlwriter.c,v 1.20.2.12.2.14 2007/05/08 21:41:36 pajoye Exp $ */
 
 #ifdef HAVE_CONFIG_H

 #include "config.h"
@@ -695,7 +695,6 @@
 }
 /* }}} */
 
-

 /* {{{ proto bool xmlwriter_start_element_ns(resource xmlwriter, string 
prefix, string name, string uri)
 Create start namespaced element tag - returns FALSE on error */
 static PHP_FUNCTION(xmlwriter_start_element_ns)
@@ -756,20 +755,21 @@
 }
 /* }}} */
 
-/* {{{ proto bool xmlwriter_write_element(resource xmlwriter, string name, string content)

+/* {{{ proto bool xmlwriter_write_element(resource xmlwriter, string name[, 
string content])
 Write full element tag - returns FALSE on error */
 static PHP_FUNCTION(xmlwriter_write_element)
 {
zval *pind;
xmlwriter_object *intern;
xmlTextWriterPtr ptr;
-   char *name, *content;
+   char *name, *content = NULL;
int name_len, content_len, retval;
+
 #ifdef ZEND_ENGINE_2
zval *this = getThis();

if (this) {
-   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss",
+   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|s",
&name, &name_len, &content, &content_len) == FAILURE) {
return;
}
@@ -789,7 +789,18 @@
ptr = intern->ptr;
 
 	if (ptr) {

-   retval = xmlTextWriterWriteElement(ptr, (xmlChar *)name, 
(xmlChar *)content);
+   if (!content || content_len < 1) {
+   retval = xmlTextWriterStartElement(ptr, (xmlChar 
*)name);
+if (retval == -1) {
+RETURN_FALSE;
+}
+   xmlTextWriterEndElement(ptr);
+if (retval == -1) {
+RETURN_FALSE;
+}
+   } else {
+   retval = xmlTextWriterWriteElement(ptr, (xmlChar 
*)name, (xmlChar *)content);
+   }
if (retval != -1) {
RETURN_TRUE;
}
@@ -799,21 +810,21 @@
 }
 /* }}} */
 
-/* {{{ proto bool xmlwriter_write_element_ns(resource xmlwriter, string prefix, string name, string uri, string content)

+/* {{{ proto bool xmlwriter_write_element_ns(resource xmlwriter, string 
prefix, string name, string uri[, string content])
 Write full namesapced element tag - returns FALSE on error */
 static PHP_FUNCTION(xmlwriter_write_element_ns)
 {
zval *pind;
xmlwriter_object *intern;
xmlTextWriterPtr ptr;
-   char *name, *prefix, *uri, *content;
+   char *name, *prefix, *uri, *content = NULL;
int name_len, prefix_len, uri_len, content_len, retval;
 
 #ifdef ZEND_ENGINE_2

zval *this = getThis();

if (this) {
-		if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s!ss!s", 
+		if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s!ss!|s", 
 			&prefix, &prefix_len, &name, &name_len, &uri, &uri_len, &content, &content_len) == FAILURE) {

return;
}
@@ -821,7 +832,7 @@
} else
 #endif
{
-		if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs!ss!s", &pind, 
+		if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs!ss!|s", &pind, 
 			&pre

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/xmlwriter php_xmlwriter.c /ext/xmlwriter/tests bug41287.phpt bug41326.phpt

2007-05-08 Thread Pierre-Alain Joye

pajoye  Tue May  8 21:41:36 2007 UTC

  Added files: (Branch: PHP_5_2)
/php-src/ext/xmlwriter/testsbug41326.phpt 

  Modified files:  
/php-srcNEWS 
/php-src/ext/xmlwriter  php_xmlwriter.c 
/php-src/ext/xmlwriter/testsbug41287.phpt 
  Log:
  - MFH: #41326, Writing empty tags with Xmlwriter::WriteElement[ns]
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.689&r2=1.2027.2.547.2.690&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.689 php-src/NEWS:1.2027.2.547.2.690
--- php-src/NEWS:1.2027.2.547.2.689 Tue May  8 18:38:20 2007
+++ php-src/NEWSTue May  8 21:41:36 2007
@@ -7,6 +7,8 @@
   (Ilia)
 - Fixed altering $this via argument named "this". (Dmitry)
 - Fixed PHP CLI to use the php.ini from the binary location. (Hannes)
+- Fixed bug #41326 (Writing empty tags with Xmlwriter::WriteElement[ns])
+  (Pierre)
 - Fixed bug #41321 (downgrade read errors in getimagesize() to E_NOTICE).
   (Ilia)
 - Fixed bug #41304 (compress.zlib temp files left). (Dmitry)
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlwriter/php_xmlwriter.c?r1=1.20.2.12.2.13&r2=1.20.2.12.2.14&diff_format=u
Index: php-src/ext/xmlwriter/php_xmlwriter.c
diff -u php-src/ext/xmlwriter/php_xmlwriter.c:1.20.2.12.2.13 
php-src/ext/xmlwriter/php_xmlwriter.c:1.20.2.12.2.14
--- php-src/ext/xmlwriter/php_xmlwriter.c:1.20.2.12.2.13Fri May  4 
20:16:39 2007
+++ php-src/ext/xmlwriter/php_xmlwriter.c   Tue May  8 21:41:36 2007
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: php_xmlwriter.c,v 1.20.2.12.2.13 2007/05/04 20:16:39 rrichards Exp $ */
+/* $Id: php_xmlwriter.c,v 1.20.2.12.2.14 2007/05/08 21:41:36 pajoye Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -695,7 +695,6 @@
 }
 /* }}} */
 
-
 /* {{{ proto bool xmlwriter_start_element_ns(resource xmlwriter, string 
prefix, string name, string uri)
 Create start namespaced element tag - returns FALSE on error */
 static PHP_FUNCTION(xmlwriter_start_element_ns)
@@ -756,20 +755,21 @@
 }
 /* }}} */
 
-/* {{{ proto bool xmlwriter_write_element(resource xmlwriter, string name, 
string content)
+/* {{{ proto bool xmlwriter_write_element(resource xmlwriter, string name[, 
string content])
 Write full element tag - returns FALSE on error */
 static PHP_FUNCTION(xmlwriter_write_element)
 {
zval *pind;
xmlwriter_object *intern;
xmlTextWriterPtr ptr;
-   char *name, *content;
+   char *name, *content = NULL;
int name_len, content_len, retval;
+
 #ifdef ZEND_ENGINE_2
zval *this = getThis();

if (this) {
-   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss",
+   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|s",
&name, &name_len, &content, &content_len) == FAILURE) {
return;
}
@@ -789,7 +789,18 @@
ptr = intern->ptr;
 
if (ptr) {
-   retval = xmlTextWriterWriteElement(ptr, (xmlChar *)name, 
(xmlChar *)content);
+   if (!content || content_len < 1) {
+   retval = xmlTextWriterStartElement(ptr, (xmlChar 
*)name);
+if (retval == -1) {
+RETURN_FALSE;
+}
+   xmlTextWriterEndElement(ptr);
+if (retval == -1) {
+RETURN_FALSE;
+}
+   } else {
+   retval = xmlTextWriterWriteElement(ptr, (xmlChar 
*)name, (xmlChar *)content);
+   }
if (retval != -1) {
RETURN_TRUE;
}
@@ -799,21 +810,21 @@
 }
 /* }}} */
 
-/* {{{ proto bool xmlwriter_write_element_ns(resource xmlwriter, string 
prefix, string name, string uri, string content)
+/* {{{ proto bool xmlwriter_write_element_ns(resource xmlwriter, string 
prefix, string name, string uri[, string content])
 Write full namesapced element tag - returns FALSE on error */
 static PHP_FUNCTION(xmlwriter_write_element_ns)
 {
zval *pind;
xmlwriter_object *intern;
xmlTextWriterPtr ptr;
-   char *name, *prefix, *uri, *content;
+   char *name, *prefix, *uri, *content = NULL;
int name_len, prefix_len, uri_len, content_len, retval;
 
 #ifdef ZEND_ENGINE_2
zval *this = getThis();

if (this) {
-   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s!ss!s", 
+   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s!ss!|s", 
&prefix, &prefix_len, &name, &name_len, &uri, &uri_len, 
&content, &content_len) == FAILURE) {
return;
}
@@ -821,7 +832,7 @@
} else
 #endif
{
-   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs!ss!s", 
&pind, 
+   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/xmlwriter php_xmlwriter.c

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/xmlwriter php_xmlwriter.c

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/xmlwriter php_xmlwriter.c

Re: [PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/xmlwriter php_xmlwriter.c /ext/xmlwriter/tests bug41287.phpt bug41326.phpt

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/xmlwriter php_xmlwriter.c /ext/xmlwriter/tests bug41287.phpt bug41326.phpt

5 matches

Site Navigation

Mail list logo

Footer information