[PHP-CVS] cvs: php-src(PHP_5_0) /ext/xsl xsltprocessor.c

2005-06-14 Thread Rob Richards 
rrichards   Tue Jun 14 15:40:34 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/xslxsltprocessor.c 
  Log:
  MFH: Fixed bug #33340 (CLI Crash when calling php:function from XSLT)
  
http://cvs.php.net/diff.php/php-src/ext/xsl/xsltprocessor.c?r1=1.29.2.5r2=1.29.2.6ty=u
Index: php-src/ext/xsl/xsltprocessor.c
diff -u php-src/ext/xsl/xsltprocessor.c:1.29.2.5 
php-src/ext/xsl/xsltprocessor.c:1.29.2.6
--- php-src/ext/xsl/xsltprocessor.c:1.29.2.5Mon Jan 17 11:01:35 2005
+++ php-src/ext/xsl/xsltprocessor.c Tue Jun 14 15:40:33 2005
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: xsltprocessor.c,v 1.29.2.5 2005/01/17 16:01:35 chregu Exp $ */
+/* $Id: xsltprocessor.c,v 1.29.2.6 2005/06/14 19:40:33 rrichards Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -200,7 +200,7 @@
int j;
dom_object *domintern;
array_init(args[i]);
-   if (obj-nodesetval-nodeNr  0) {
+   if (obj-nodesetval  
obj-nodesetval-nodeNr  0) {
domintern = (dom_object *) 
php_dom_object_get_data((void *) obj-nodesetval-nodeTab[0]-doc);
for (j = 0; j  
obj-nodesetval-nodeNr; j++) {
xmlNodePtr node = 
obj-nodesetval-nodeTab[j];

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_0) /ext/xsl xsltprocessor.c

2004-08-10 Thread Christian Stocker 
chregu  Tue Aug 10 04:02:01 2004 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/xslxsltprocessor.c 
  Log:
  MFH (Fix segfault on error in xslt)
  
  
http://cvs.php.net/diff.php/php-src/ext/xsl/xsltprocessor.c?r1=1.29.2.2r2=1.29.2.3ty=u
Index: php-src/ext/xsl/xsltprocessor.c
diff -u php-src/ext/xsl/xsltprocessor.c:1.29.2.2 
php-src/ext/xsl/xsltprocessor.c:1.29.2.3
--- php-src/ext/xsl/xsltprocessor.c:1.29.2.2Sun Aug  8 14:05:47 2004
+++ php-src/ext/xsl/xsltprocessor.c Tue Aug 10 04:02:00 2004
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: xsltprocessor.c,v 1.29.2.2 2004/08/08 18:05:47 chregu Exp $ */
+/* $Id: xsltprocessor.c,v 1.29.2.3 2004/08/10 08:02:00 chregu Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -400,7 +400,10 @@
char **params = NULL;
int clone;
 
-
+   if (style == NULL) {
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, No stylesheet associated 
to this object);
+   return NULL;
+   }
if (intern-parameter) {
params = php_xsl_xslt_make_params(intern-parameter, 0 TSRMLS_CC);
}

-- 
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_0) /ext/xsl xsltprocessor.c

2004-08-10 Thread Andi Gutmans 
News?
At 08:02 AM 8/10/2004 +, Christian Stocker wrote:
chregu  Tue Aug 10 04:02:01 2004 EDT
  Modified files:  (Branch: PHP_5_0)
/php-src/ext/xslxsltprocessor.c
  Log:
  MFH (Fix segfault on error in xslt)
http://cvs.php.net/diff.php/php-src/ext/xsl/xsltprocessor.c?r1=1.29.2.2r2=1.29.2.3ty=u
Index: php-src/ext/xsl/xsltprocessor.c
diff -u php-src/ext/xsl/xsltprocessor.c:1.29.2.2 
php-src/ext/xsl/xsltprocessor.c:1.29.2.3
--- php-src/ext/xsl/xsltprocessor.c:1.29.2.2Sun Aug  8 14:05:47 2004
+++ php-src/ext/xsl/xsltprocessor.c Tue Aug 10 04:02:00 2004
@@ -17,7 +17,7 @@
+--+
 */

-/* $Id: xsltprocessor.c,v 1.29.2.2 2004/08/08 18:05:47 chregu Exp $ */
+/* $Id: xsltprocessor.c,v 1.29.2.3 2004/08/10 08:02:00 chregu Exp $ */
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -400,7 +400,10 @@
char **params = NULL;
int clone;
-
+   if (style == NULL) {
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, No stylesheet 
associated to this object);
+   return NULL;
+   }
if (intern-parameter) {
params = php_xsl_xslt_make_params(intern-parameter, 0 
TSRMLS_CC);
}

--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
--
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_0) /ext/xsl xsltprocessor.c

2004-08-10 Thread Christian Stocker 

On 10.8.2004 10:25 Uhr, Andi Gutmans wrote:
News?
Should I really add it?
The bug was not existent in 5.0.0 and there was no bugreport.
chregu
At 08:02 AM 8/10/2004 +, Christian Stocker wrote:
chregu  Tue Aug 10 04:02:01 2004 EDT
  Modified files:  (Branch: PHP_5_0)
/php-src/ext/xslxsltprocessor.c
  Log:
  MFH (Fix segfault on error in xslt)
http://cvs.php.net/diff.php/php-src/ext/xsl/xsltprocessor.c?r1=1.29.2.2r2=1.29.2.3ty=u 

Index: php-src/ext/xsl/xsltprocessor.c
diff -u php-src/ext/xsl/xsltprocessor.c:1.29.2.2 
php-src/ext/xsl/xsltprocessor.c:1.29.2.3
--- php-src/ext/xsl/xsltprocessor.c:1.29.2.2Sun Aug  8 14:05:47 2004
+++ php-src/ext/xsl/xsltprocessor.c Tue Aug 10 04:02:00 2004
@@ -17,7 +17,7 @@

+--+
 */

-/* $Id: xsltprocessor.c,v 1.29.2.2 2004/08/08 18:05:47 chregu Exp $ */
+/* $Id: xsltprocessor.c,v 1.29.2.3 2004/08/10 08:02:00 chregu Exp $ */
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -400,7 +400,10 @@
char **params = NULL;
int clone;
-
+   if (style == NULL) {
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, No 
stylesheet associated to this object);
+   return NULL;
+   }
if (intern-parameter) {
params = php_xsl_xslt_make_params(intern-parameter, 0 
TSRMLS_CC);
}

--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
--
christian stocker | Bitflux GmbH | schoeneggstrasse 5 | ch-8004 zurich
phone +41 1 240 56 70 | mobile +41 76 561 88 60  | fax +41 1 240 56 71
http://www.bitflux.ch  |  [EMAIL PROTECTED]  |  gnupg-keyid 0x5CE1DECB
--
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_0) /ext/xsl xsltprocessor.c

2004-08-10 Thread Andi Gutmans 
Nope you shouldn't. I thought it existed in 5.0.0 too.
At 10:41 AM 8/10/2004 +0200, Christian Stocker wrote:

On 10.8.2004 10:25 Uhr, Andi Gutmans wrote:
News?
Should I really add it?
The bug was not existent in 5.0.0 and there was no bugreport.
chregu
At 08:02 AM 8/10/2004 +, Christian Stocker wrote:
chregu  Tue Aug 10 04:02:01 2004 EDT
  Modified files:  (Branch: PHP_5_0)
/php-src/ext/xslxsltprocessor.c
  Log:
  MFH (Fix segfault on error in xslt)
http://cvs.php.net/diff.php/php-src/ext/xsl/xsltprocessor.c?r1=1.29.2.2r2=1.29.2.3ty=u 

Index: php-src/ext/xsl/xsltprocessor.c
diff -u php-src/ext/xsl/xsltprocessor.c:1.29.2.2 
php-src/ext/xsl/xsltprocessor.c:1.29.2.3
--- php-src/ext/xsl/xsltprocessor.c:1.29.2.2Sun Aug  8 14:05:47 2004
+++ php-src/ext/xsl/xsltprocessor.c Tue Aug 10 04:02:00 2004
@@ -17,7 +17,7 @@

+--+
 */
-/* $Id: xsltprocessor.c,v 1.29.2.2 2004/08/08 18:05:47 chregu Exp $ */
+/* $Id: xsltprocessor.c,v 1.29.2.3 2004/08/10 08:02:00 chregu Exp $ */
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -400,7 +400,10 @@
char **params = NULL;
int clone;
-
+   if (style == NULL) {
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, No 
stylesheet associated to this object);
+   return NULL;
+   }
if (intern-parameter) {
params = php_xsl_xslt_make_params(intern-parameter, 0 
TSRMLS_CC);
}

--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
--
christian stocker | Bitflux GmbH | schoeneggstrasse 5 | ch-8004 zurich
phone +41 1 240 56 70 | mobile +41 76 561 88 60  | fax +41 1 240 56 71
http://www.bitflux.ch  |  [EMAIL PROTECTED]  |  gnupg-keyid 0x5CE1DECB
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php