Skip to content

Fix TsHashTable related race conditions #4341

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Fix TsHashTable related race conditions #4341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ext/com_dotnet/com_com.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ PHP_FUNCTION(com_create_instance)
if (SUCCEEDED(ITypeLib_GetDocumentation(TL, -1, &name, NULL, NULL, NULL))) {
typelib_name = php_com_olestring_to_string(name, &typelib_name_len, obj->code_page);

if (NULL != zend_ts_hash_str_add_ptr(&php_com_typelibraries, typelib_name, typelib_name_len, TL)) {
if (NULL != php_com_cache_typelib(TL, typelib_name, typelib_name_len)) {
php_com_import_typelib(TL, mode, obj->code_page);

/* add a reference for the hash */
Expand Down
10 changes: 5 additions & 5 deletions ext/com_dotnet/com_extension.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@
ZEND_DECLARE_MODULE_GLOBALS(com_dotnet)
static PHP_GINIT_FUNCTION(com_dotnet);

TsHashTable php_com_typelibraries;

zend_class_entry
*php_com_variant_class_entry,
*php_com_exception_class_entry,
Expand Down Expand Up @@ -330,8 +328,6 @@ PHP_MINIT_FUNCTION(com_dotnet)
tmp->serialize = zend_class_serialize_deny;
tmp->unserialize = zend_class_unserialize_deny;

zend_ts_hash_init(&php_com_typelibraries, 0, NULL, php_com_typelibrary_dtor, 1);

#if HAVE_MSCOREE_H
INIT_CLASS_ENTRY(ce, "dotnet", NULL);
ce.create_object = php_com_object_new;
Expand Down Expand Up @@ -418,6 +414,9 @@ PHP_MINIT_FUNCTION(com_dotnet)
COM_CONST(VT_UI8);
COM_CONST(VT_I8);
#endif

PHP_MINIT(com_typeinfo)(INIT_FUNC_ARGS_PASSTHRU);

return SUCCESS;
}
/* }}} */
Expand All @@ -433,7 +432,8 @@ PHP_MSHUTDOWN_FUNCTION(com_dotnet)
}
#endif

zend_ts_hash_destroy(&php_com_typelibraries);
PHP_MSHUTDOWN(com_typeinfo)(INIT_FUNC_ARGS_PASSTHRU);

return SUCCESS;
}
/* }}} */
Expand Down
64 changes: 57 additions & 7 deletions ext/com_dotnet/com_typeinfo.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,33 @@
#include "php_com_dotnet.h"
#include "php_com_dotnet_internal.h"

static HashTable php_com_typelibraries;

#ifdef ZTS
static MUTEX_T php_com_typelibraries_mutex;
#endif

PHP_MINIT_FUNCTION(com_typeinfo)
{
zend_hash_init(&php_com_typelibraries, 0, NULL, php_com_typelibrary_dtor, 1);

#ifdef ZTS
php_com_typelibraries_mutex = tsrm_mutex_alloc();
#endif

return SUCCESS;
}

PHP_MSHUTDOWN_FUNCTION(com_typeinfo)
{
zend_hash_destroy(&php_com_typelibraries);

#ifdef ZTS
tsrm_mutex_free(php_com_typelibraries_mutex);
#endif

return SUCCESS;
}

/* The search string can be either:
* a) a file name
Expand Down Expand Up @@ -220,35 +247,58 @@ void php_com_typelibrary_dtor(zval *pDest)
ITypeLib_Release(Lib);
}

ITypeLib *php_com_cache_typelib(ITypeLib* TL, char *cache_key, zend_long cache_key_len) {
ITypeLib* result;
#ifdef ZTS
tsrm_mutex_lock(php_com_typelibraries_mutex);
#endif

result = zend_hash_str_add_ptr(&php_com_typelibraries, cache_key, cache_key_len, TL);

#ifdef ZTS
tsrm_mutex_unlock(php_com_typelibraries_mutex);
#endif

return result;
}

PHP_COM_DOTNET_API ITypeLib *php_com_load_typelib_via_cache(char *search_string,
int codepage, int *cached)
{
ITypeLib *TL;
char *name_dup;
size_t l;
zend_string *key = zend_string_init(search_string, strlen(search_string), 1);

l = strlen(search_string);
#ifdef ZTS
tsrm_mutex_lock(php_com_typelibraries_mutex);
#endif

if ((TL = zend_ts_hash_str_find_ptr(&php_com_typelibraries, search_string, l)) != NULL) {
if ((TL = zend_hash_find_ptr(&php_com_typelibraries, key)) != NULL) {
*cached = 1;
/* add a reference for the caller */
ITypeLib_AddRef(TL);
return TL;

goto php_com_load_typelib_via_cache_return;
}

*cached = 0;
name_dup = estrndup(search_string, l);
name_dup = estrndup(ZSTR_VAL(key), ZSTR_LEN(key));
TL = php_com_load_typelib(name_dup, codepage);
efree(name_dup);

if (TL) {
if (NULL != zend_ts_hash_str_update_ptr(&php_com_typelibraries,
search_string, l, TL)) {
if (NULL != zend_hash_add_ptr(&php_com_typelibraries, key, TL)) {
/* add a reference for the hash table */
ITypeLib_AddRef(TL);
}
}

php_com_load_typelib_via_cache_return:
#ifdef ZTS
tsrm_mutex_unlock(php_com_typelibraries_mutex);
#endif
zend_string_release(key);

return TL;
}

Expand Down
6 changes: 3 additions & 3 deletions ext/com_dotnet/php_com_dotnet_internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@
#include <dispex.h>
#include "win32/winutil.h"

#include "zend_ts_hash.h"

typedef struct _php_com_dotnet_object {
zend_object zo;

Expand Down Expand Up @@ -70,7 +68,6 @@ static inline int php_com_is_valid_object(zval *zv)
} while(0)

/* com_extension.c */
TsHashTable php_com_typelibraries;
zend_class_entry *php_com_variant_class_entry, *php_com_exception_class_entry, *php_com_saproxy_class_entry;

/* com_handlers.c */
Expand Down Expand Up @@ -175,6 +172,9 @@ PHP_COM_DOTNET_API int php_com_import_typelib(ITypeLib *TL, int mode,
void php_com_typelibrary_dtor(zval *pDest);
ITypeInfo *php_com_locate_typeinfo(char *typelibname, php_com_dotnet_object *obj, char *dispname, int sink);
int php_com_process_typeinfo(ITypeInfo *typeinfo, HashTable *id_to_name, int printdef, GUID *guid, int codepage);
ITypeLib *php_com_cache_typelib(ITypeLib* TL, char *cache_key, zend_long cache_key_len);
PHP_MINIT_FUNCTION(com_typeinfo);
PHP_MSHUTDOWN_FUNCTION(com_typeinfo);

/* com_iterator.c */
zend_object_iterator *php_com_iter_get(zend_class_entry *ce, zval *object, int by_ref);
Expand Down