xinb
/
ip2region_private
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix memory leak and symbol duplicate

This commit is contained in:
PHP Static 2020-03-22 11:38:21 +08:00
parent e701781239
commit 28f818e91a
4 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
binding/php5_ext/ip2region.c
View File

@ -182,7 +182,7 @@ PHP_METHOD(ip2region_class_entry_ptr, binarySearch)
PHP_MSHUTDOWN_FUNCTION(ip2region) PHP_MSHUTDOWN_FUNCTION(ip2region)
{ {
UNREGISTER_INI_ENTRIES(); UNREGISTER_INI_ENTRIES();
ip2region_destroy(&g_resource); if(g_resource_ptr != NULL) ip2region_destroy(&g_resource);
return SUCCESS; return SUCCESS;
} }
/* }}} */ /* }}} */
@ -256,8 +256,8 @@ PHP_MINIT_FUNCTION(ip2region)
ZEND_INIT_MODULE_GLOBALS(ip2region, php_ip2region_init_globals, NULL); ZEND_INIT_MODULE_GLOBALS(ip2region, php_ip2region_init_globals, NULL);
REGISTER_INI_ENTRIES(); REGISTER_INI_ENTRIES();
char* _db_file = IP2REGION_G(db_file);
if (ip2region_create( &g_resource, IP2REGION_G(db_file)) == 0) if ( _db_file == NULL || ip2region_create( &g_resource, _db_file) == 0)
{ {
g_resource_ptr = NULL; g_resource_ptr = NULL;
} else { } else {

1
binding/php5_ext/php_ip2region.h
View File

@ -65,7 +65,6 @@ static void php_ip2region_init_globals(zend_ip2region_globals *);
#define le_ip2region_name "Ip2region" #define le_ip2region_name "Ip2region"
void search( ip2region_t, uint_t (*func_ptr) (ip2region_t, uint_t, datablock_t), long , zval **, datablock_t);
#endif /* PHP_IP2REGION_H */ #endif /* PHP_IP2REGION_H */
/* /*

8
binding/php7_ext/ip2region.c
View File

@ -50,7 +50,7 @@ static zend_class_entry *ip2region_class_entry_ptr;
//} //}
void search( static void search(
ip2region_t g_resouce_ptr, ip2region_t g_resouce_ptr,
uint_t (*func_ptr) (ip2region_t, uint_t, datablock_t), uint_t (*func_ptr) (ip2region_t, uint_t, datablock_t),
long ip, long ip,
@ -188,7 +188,7 @@ PHP_METHOD(ip2region_class_entry_ptr, binarySearch)
PHP_MSHUTDOWN_FUNCTION(ip2region) PHP_MSHUTDOWN_FUNCTION(ip2region)
{ {
UNREGISTER_INI_ENTRIES(); UNREGISTER_INI_ENTRIES();
ip2region_destroy(&g_resource); if( g_resource_ptr != NULL ) ip2region_destroy(&g_resource);
return SUCCESS; return SUCCESS;
} }
/* }}} */ /* }}} */
@ -262,8 +262,8 @@ PHP_MINIT_FUNCTION(ip2region)
ZEND_INIT_MODULE_GLOBALS(ip2region, php_ip2region_init_globals, NULL); ZEND_INIT_MODULE_GLOBALS(ip2region, php_ip2region_init_globals, NULL);
REGISTER_INI_ENTRIES(); REGISTER_INI_ENTRIES();
char* _db_file = IP2REGION_G(db_file);
if (ip2region_create( &g_resource, IP2REGION_G(db_file)) == 0) if ( _db_file == NULL || ip2region_create( &g_resource, _db_file) == 0)
{ {
g_resource_ptr = NULL; g_resource_ptr = NULL;
} else { } else {

1
binding/php7_ext/php_ip2region.h
View File

@ -65,7 +65,6 @@ static void php_ip2region_init_globals(zend_ip2region_globals *);
#define le_ip2region_name "Ip2region" #define le_ip2region_name "Ip2region"
void search( ip2region_t, uint_t (*func_ptr) (ip2region_t, uint_t, datablock_t), long , zval **, datablock_t);
#endif /* PHP_IP2REGION_H */ #endif /* PHP_IP2REGION_H */
/* /*