to exception

Author: devnexen

ext/snmp/snmp.c

@@ -842,7 +842,7 @@ static bool snmp_session_init(php_snmp_session **session_p, int version, zend_st
 	struct sockaddr **res;
 
 	if (ZSTR_LEN(hostname) >= MAX_NAME_LEN) {
-		php_error_docref(NULL, E_WARNING, "hostname length must be lower than %d", MAX_NAME_LEN);
+		zend_value_error("hostname length must be lower than %d", MAX_NAME_LEN);
 		return false;
 	}
 
@@ -872,7 +872,7 @@ static bool snmp_session_init(php_snmp_session **session_p, int version, zend_st
 				char *pport = pptr + 2;
 				tmp_port = atoi(pport);
 				if (tmp_port < 0 || tmp_port > USHRT_MAX) {
-					php_error_docref(NULL, E_WARNING, "Remote port must be between 0 and %u", USHRT_MAX);
+					zend_value_error("remote port must be between 0 and %u", USHRT_MAX);
 					return false;
 				}
 				remote_port = (unsigned short)tmp_port;
@@ -887,7 +887,7 @@ static bool snmp_session_init(php_snmp_session **session_p, int version, zend_st
 			char *pport = pptr + 1;
 			tmp_port = atoi(pport);
 			if (tmp_port < 0 || tmp_port > USHRT_MAX) {
-				php_error_docref(NULL, E_WARNING, "Remote port must be between 0 and %u", USHRT_MAX);
+				zend_value_error("remote port must be between 0 and %u", USHRT_MAX);
 				return false;
 			}
 			remote_port = (unsigned short)tmp_port;

ext/snmp/tests/snmp_session_error.phpt

@@ -13,16 +13,25 @@ require_once(__DIR__.'/skipif.inc');
 require_once(__DIR__.'/snmp_include.inc');
 
 $longhostname = str_repeat($hostname4, 1_000_000);
-new SNMP(SNMP::VERSION_1, "$hostname4:-1", $community, $timeout, $retries);
-new SNMP(SNMP::VERSION_1, "$hostname4:65536", $community, $timeout, $retries);
-new SNMP(SNMP::VERSION_1, "$longhostname:$port", $community, $timeout, $retries);
+try {
+	new SNMP(SNMP::VERSION_1, "$hostname4:-1", $community, $timeout, $retries);
+} catch (\ValueError $e) {
+	echo $e->getMessage(), PHP_EOL;
+}
+try {
+	new SNMP(SNMP::VERSION_1, "$hostname4:65536", $community, $timeout, $retries);
+} catch (\ValueError $e) {
+	echo $e->getMessage(), PHP_EOL;
+}
+try {
+	new SNMP(SNMP::VERSION_1, "$longhostname:$port", $community, $timeout, $retries);
+} catch (\ValueError $e) {
+	echo $e->getMessage(), PHP_EOL;
+}
 echo "OK";
 ?>
---EXPECTF--
-
-Warning: SNMP::__construct(): Remote port must be between 0 and 65535 in %s on line %d
-
-Warning: SNMP::__construct(): Remote port must be between 0 and 65535 in %s on line %d
-
-Warning: SNMP::__construct(): hostname length must be lower than 128 in %s on line %d
+--EXPECT--
+remote port must be between 0 and 65535
+remote port must be between 0 and 65535
+hostname length must be lower than 128
 OK