cvs: php4 /ext/snmp snmp.c

ssb Mon Oct 15 14:36:43 2001 EDT Modified files: /php4/ext/snmp snmp.c Log: fix bug #13479 Index: php4/ext/snmp/snmp.c diff -u php4/ext/snmp/snmp.c:1.52 php4/ext/snmp/snmp.c:1.53 --- php4/ext/snmp/snmp.c:1.52 Thu Oct 11 19:33:46 2001 +++ php4/ext/snmp/snmp.c Mon Oct 15 14:36:43 2001 @@ -17,7 +17,7 @@ | Steven Lawrance <slawrance@technologist.com> | +----------------------------------------------------------------------+ */ -/* $Id: snmp.c,v 1.52 2001/10/11 23:33:46 ssb Exp $ */ +/* $Id: snmp.c,v 1.53 2001/10/15 18:36:43 ssb Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -271,6 +271,7 @@ case 3: if (array_init(return_value) == FAILURE) { php_error(E_WARNING, "Cannot prepare result array"); + snmp_close(ss); RETURN_FALSE; } break; @@ -287,6 +288,7 @@ name_length = MAX_NAME_LEN; if ( !read_objid(objid, name, &name_length) ) { php_error(E_WARNING,"Invalid object identifier: %s\n", objid); + snmp_close(ss); RETURN_FALSE; } snmp_add_null_var(pdu, name, name_length); @@ -294,6 +296,7 @@ pdu = snmp_pdu_create(SNMP_MSG_SET); if (snmp_add_var(pdu, name, name_length, type, value)) { php_error(E_WARNING,"Could not add variable: %s\n", name); + snmp_close(ss); RETURN_FALSE; } } else if (st >= 2) { @@ -358,14 +361,17 @@ goto retry; } } + snmp_close(ss); RETURN_FALSE; } } } else if (status == STAT_TIMEOUT) { php_error(E_WARNING,"No Response from %s\n", Z_STRVAL_PP(a1)); + snmp_close(ss); RETURN_FALSE; } else { /* status == STAT_ERROR */ php_error(E_WARNING,"An error occurred, Quitting...\n"); + snmp_close(ss); RETURN_FALSE; } if (response) {