[PHP-CVS] cvs: php-src /ext/com_dotnet com_handlers.c

[Wez Furlong]

wez             Tue Jul 27 18:17:00 2004 EDT

  Modified files:              
    /php-src/ext/com_dotnet     com_handlers.c 
  Log:
  "better" "fix" for #29392.
  This fixes the crash; the sample script:
  
        $c = new COM('ADODB.Connection');
        echo $c;
  
  still does not work because the engine tries to call $c->__toString() and the
  ADODB object *might* implement that method, but doesn't know until you open the
  connection.
  
  
  
  
http://cvs.php.net/diff.php/php-src/ext/com_dotnet/com_handlers.c?r1=1.24&r2=1.25&ty=u
Index: php-src/ext/com_dotnet/com_handlers.c
diff -u php-src/ext/com_dotnet/com_handlers.c:1.24 
php-src/ext/com_dotnet/com_handlers.c:1.25
--- php-src/ext/com_dotnet/com_handlers.c:1.24  Mon Jul 26 22:37:54 2004
+++ php-src/ext/com_dotnet/com_handlers.c       Tue Jul 27 18:17:00 2004
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: com_handlers.c,v 1.24 2004/07/27 02:37:54 wez Exp $ */
+/* $Id: com_handlers.c,v 1.25 2004/07/27 22:17:00 wez Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -286,11 +286,19 @@
        }
 }
 
+static PHP_FUNCTION(com_method_handler)
+{
+       Z_OBJ_HANDLER_P(getThis(), call_method)(
+                       
((zend_internal_function*)EG(function_state_ptr)->function)->function_name,
+                       INTERNAL_FUNCTION_PARAM_PASSTHRU);
+}
+
 static union _zend_function *com_method_get(zval *object, char *name, int len 
TSRMLS_DC)
 {
        zend_internal_function f, *fptr = NULL;
        php_com_dotnet_object *obj;
        union _zend_function *func;
+       DISPID dummy;
 
        obj = CDNO_FETCH(object);
 
@@ -298,6 +306,10 @@
                return NULL;
        }
 
+       if (FAILED(php_com_get_id_of_name(obj, name, len, &dummy TSRMLS_CC))) {
+               return NULL;
+       }
+
        /* check cache */
        if (obj->method_cache == NULL || FAILURE == zend_hash_find(obj->method_cache, 
name, len, (void**)&fptr)) {
                f.type = ZEND_OVERLOADED_FUNCTION;
@@ -306,6 +318,7 @@
                f.scope = obj->ce;
                f.fn_flags = 0;
                f.function_name = estrndup(name, len);
+               f.handler = PHP_FN(com_method_handler);
 
                fptr = &f;
                
@@ -350,8 +363,6 @@
                                                        break;
 
                                                case DESCKIND_NONE:
-                                               //default:
-                                               //      fptr = NULL;
                                                        break;
                                        }
                                        if (TI) {

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