]> granicus.if.org Git - php/commitdiff
MFH: - Fix some memory leaks
authorfoobar <sniper@php.net>
Sat, 8 Jan 2005 12:02:50 +0000 (12:02 +0000)
committerfoobar <sniper@php.net>
Sat, 8 Jan 2005 12:02:50 +0000 (12:02 +0000)
ext/snmp/php_snmp.h
ext/snmp/snmp.c

index cf572ec68135840d5e00c035bf9de53f8427dda9..635d2e01b9292c5082a7468ea1acc149e2057a6f 100644 (file)
@@ -39,6 +39,7 @@ extern zend_module_entry snmp_module_entry;
 #endif
 
 PHP_MINIT_FUNCTION(snmp);
+PHP_MSHUTDOWN_FUNCTION(snmp);
 PHP_MINFO_FUNCTION(snmp);
 
 PHP_FUNCTION(snmpget);
index 2bc437ba78374847d5342054dbae39f4c973ec81..e9426f34a720ab8de1ad698d30908b4cf9e6e370 100644 (file)
@@ -151,7 +151,7 @@ zend_module_entry snmp_module_entry = {
        "snmp",
        snmp_functions,
        PHP_MINIT(snmp),
-       NULL,
+       PHP_MSHUTDOWN(snmp),
        NULL,
        NULL,
        PHP_MINFO(snmp),
@@ -178,7 +178,7 @@ static void php_snmp_init_globals(zend_snmp_globals *snmp_globals)
  */
 PHP_MINIT_FUNCTION(snmp)
 {
-       init_snmp("snmpapp");
+       init_snmp("php");
 
        ZEND_INIT_MODULE_GLOBALS(snmp, php_snmp_init_globals, NULL);
 
@@ -203,6 +203,16 @@ PHP_MINIT_FUNCTION(snmp)
 }
 /* }}} */
 
+/* {{{ PHP_MSHUTDOWN_FUNCTION
+ */
+PHP_MSHUTDOWN_FUNCTION(snmp)
+{
+       snmp_shutdown("php");
+
+       return SUCCESS;
+}
+/* }}} */
+
 /* {{{ PHP_MINFO_FUNCTION
  */
 PHP_MINFO_FUNCTION(snmp)
@@ -816,7 +826,7 @@ static int netsnmp_session_gen_auth_key(struct snmp_session *s, char *pass TSRML
                s->securityAuthKeyLen = USM_AUTH_KU_LEN;
                if (s->securityAuthProto == NULL) {
                        /* get .conf set default */
-                       oid *def = get_default_authtype(&(s->securityAuthProtoLen));
+                       const oid *def = get_default_authtype(&(s->securityAuthProtoLen));
                        s->securityAuthProto = snmp_duplicate_objid(def, s->securityAuthProtoLen);
                }
                if (s->securityAuthProto == NULL) {
@@ -845,7 +855,7 @@ static int netsnmp_session_gen_sec_key(struct snmp_session *s, u_char *pass TSRM
                s->securityPrivKeyLen = USM_PRIV_KU_LEN;
                if (s->securityPrivProto == NULL) {
                        /* get .conf set default */
-                       oid *def = get_default_privtype(&(s->securityPrivProtoLen));
+                       const oid *def = get_default_privtype(&(s->securityPrivProtoLen));
                        s->securityPrivProto = snmp_duplicate_objid(def, s->securityPrivProtoLen);
                }
                if (s->securityPrivProto == NULL) {