diff options
Diffstat (limited to 'ext/com_dotnet')
| -rw-r--r-- | ext/com_dotnet/com_dotnet.c | 5 | ||||
| -rw-r--r-- | ext/com_dotnet/com_extension.c | 4 | ||||
| -rwxr-xr-x | ext/com_dotnet/com_persist.c | 4 |
3 files changed, 8 insertions, 5 deletions
diff --git a/ext/com_dotnet/com_dotnet.c b/ext/com_dotnet/com_dotnet.c index 049d95439..546e8750c 100644 --- a/ext/com_dotnet/com_dotnet.c +++ b/ext/com_dotnet/com_dotnet.c @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: com_dotnet.c 306939 2011-01-01 02:19:59Z felipe $ */ +/* $Id: com_dotnet.c 313827 2011-07-28 10:34:16Z pajoye $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -129,6 +129,9 @@ static HRESULT dotnet_init(char **p_where TSRMLS_DC) char *where = ""; stuff = malloc(sizeof(*stuff)); + if (!stuff) { + return S_FALSE; + } memset(stuff, 0, sizeof(*stuff)); where = "CoCreateInstance"; diff --git a/ext/com_dotnet/com_extension.c b/ext/com_dotnet/com_extension.c index 5034c050e..9cbb5d1b8 100644 --- a/ext/com_dotnet/com_extension.c +++ b/ext/com_dotnet/com_extension.c @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: com_extension.c 306939 2011-01-01 02:19:59Z felipe $ */ +/* $Id: com_extension.c 313665 2011-07-25 11:42:53Z felipe $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -228,7 +228,7 @@ const zend_function_entry com_dotnet_functions[] = { PHP_FE(com_message_pump, arginfo_com_message_pump) PHP_FE(com_load_typelib, arginfo_com_load_typelib) PHP_FE(com_get_active_object, arginfo_com_get_active_object) - { NULL, NULL, NULL } + PHP_FE_END }; /* {{{ com_dotnet_module_entry diff --git a/ext/com_dotnet/com_persist.c b/ext/com_dotnet/com_persist.c index d0d6ff2dc..a4b01b422 100755 --- a/ext/com_dotnet/com_persist.c +++ b/ext/com_dotnet/com_persist.c @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: com_persist.c 306939 2011-01-01 02:19:59Z felipe $ */ +/* $Id: com_persist.c 313665 2011-07-25 11:42:53Z felipe $ */ /* Infrastructure for working with persistent COM objects. * Implements: IStream* wrapper for PHP streams. @@ -697,7 +697,7 @@ static const zend_function_entry com_persist_helper_methods[] = { CPH_ME(InitNew, NULL) CPH_ME(LoadFromStream, NULL) CPH_ME(SaveToStream, NULL) - {NULL, NULL, NULL} + PHP_FE_END }; static void helper_free_storage(void *obj TSRMLS_DC) |