nlopess         Sat Jan 20 12:49:35 2007 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src/ext/tidy   tidy.c 
  Log:
  fix another crash
  
http://cvs.php.net/viewvc.cgi/php-src/ext/tidy/tidy.c?r1=1.66.2.8.2.19&r2=1.66.2.8.2.20&diff_format=u
Index: php-src/ext/tidy/tidy.c
diff -u php-src/ext/tidy/tidy.c:1.66.2.8.2.19 
php-src/ext/tidy/tidy.c:1.66.2.8.2.20
--- php-src/ext/tidy/tidy.c:1.66.2.8.2.19       Sat Jan 20 12:27:18 2007
+++ php-src/ext/tidy/tidy.c     Sat Jan 20 12:49:35 2007
@@ -16,7 +16,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: tidy.c,v 1.66.2.8.2.19 2007/01/20 12:27:18 nlopess Exp $ */
+/* $Id: tidy.c,v 1.66.2.8.2.20 2007/01/20 12:49:35 nlopess Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -715,8 +715,10 @@
                case IS_STRING:
                        obj = (PHPTidyObj *)zend_object_store_get_object(in 
TSRMLS_CC);
                        tidyBufInit(&buf);
-                       tidyNodeGetText(obj->ptdoc->doc, obj->node, &buf);
-                       ZVAL_STRINGL(out, buf.bp, buf.size-1, TRUE);
+                       if (obj->ptdoc) {
+                               tidyNodeGetText(obj->ptdoc->doc, obj->node, 
&buf);
+                       }
+                       ZVAL_STRINGL(out, buf.bp, buf.size ? buf.size-1 : 0, 
TRUE);
                        tidyBufFree(&buf);
                        break;
 
@@ -988,7 +990,7 @@
        php_info_print_table_start();
        php_info_print_table_header(2, "Tidy support", "enabled");
        php_info_print_table_row(2, "libTidy Release", (char 
*)tidyReleaseDate());
-       php_info_print_table_row(2, "Extension Version", 
PHP_TIDY_MODULE_VERSION " ($Id: tidy.c,v 1.66.2.8.2.19 2007/01/20 12:27:18 
nlopess Exp $)");
+       php_info_print_table_row(2, "Extension Version", 
PHP_TIDY_MODULE_VERSION " ($Id: tidy.c,v 1.66.2.8.2.20 2007/01/20 12:49:35 
nlopess Exp $)");
        php_info_print_table_end();
 
        DISPLAY_INI_ENTRIES();

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

Reply via email to