wez Sun Oct 12 21:29:40 2003 EDT
Modified files:
/php-src/ext/com_dotnet com_handlers.c php_com_dotnet_internal.h
Log:
Fix possible segfault (this one came up when a method could not be found).
Add a couple of headers used by another file that is not yet ready to
commit.
Index: php-src/ext/com_dotnet/com_handlers.c
diff -u php-src/ext/com_dotnet/com_handlers.c:1.4
php-src/ext/com_dotnet/com_handlers.c:1.5
--- php-src/ext/com_dotnet/com_handlers.c:1.4 Tue Oct 7 11:47:22 2003
+++ php-src/ext/com_dotnet/com_handlers.c Sun Oct 12 21:29:39 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: com_handlers.c,v 1.4 2003/10/07 15:47:22 zeev Exp $ */
+/* $Id: com_handlers.c,v 1.5 2003/10/13 01:29:39 wez Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -316,7 +316,9 @@
ITypeComp_Release(bindptr.lptcomp);
break;
}
- ITypeInfo_Release(TI);
+ if (TI) {
+ ITypeInfo_Release(TI);
+ }
}
ITypeComp_Release(comp);
efree(olename);
Index: php-src/ext/com_dotnet/php_com_dotnet_internal.h
diff -u php-src/ext/com_dotnet/php_com_dotnet_internal.h:1.1
php-src/ext/com_dotnet/php_com_dotnet_internal.h:1.2
--- php-src/ext/com_dotnet/php_com_dotnet_internal.h:1.1 Thu Aug 14 12:49:55
2003
+++ php-src/ext/com_dotnet/php_com_dotnet_internal.h Sun Oct 12 21:29:39 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_com_dotnet_internal.h,v 1.1 2003/08/14 16:49:55 wez Exp $ */
+/* $Id: php_com_dotnet_internal.h,v 1.2 2003/10/13 01:29:39 wez Exp $ */
#ifndef PHP_COM_DOTNET_INTERNAL_H
#define PHP_COM_DOTNET_INTERNAL_H
@@ -24,7 +24,9 @@
#define _WIN32_DCOM
#define COBJMACROS
#include <ocidl.h>
-#include "oleauto.h"
+#include <oleauto.h>
+#include <unknwn.h>
+#include <dispex.h>
#include "win32/winutil.h"
/* brain-death in winutil.h defines the macro to hide the useful function... */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
