Do not needlessly attach :service_mgr to an empty host (#53)

Also makes internal buffers larger to match FB5 username / password lengths

Also makes all arguments to ibase_service_attach() optional. These are not needed for embedded for example.

Author: mlazdans

ibase_service.c

@@ -214,34 +214,60 @@ PHP_FUNCTION(ibase_delete_user)
    Connect to the service manager */
 PHP_FUNCTION(ibase_service_attach)
 {
-	size_t hlen, ulen, plen, spb_len;
+	size_t hlen = 0, ulen = 0, plen = 0;
 	ibase_service *svm;
-	char buf[128], *host, *user, *pass, *loc;
+	char buf[350], *host, *user, *pass;
+	char loc[128] = "service_mgr";
 	isc_svc_handle handle = 0;
+	unsigned short p = 0;
 
 	RESET_ERRMSG;
 
-	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "sss",
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "|sss",
 			&host, &hlen, &user, &ulen, &pass, &plen)) {
 
 		RETURN_FALSE;
 	}
 
-	/* construct the spb, hack the service name into it as well */
-	spb_len = slprintf(buf, sizeof(buf), "%c%c%c%c%s%c%c%s" "%s:service_mgr",
-		isc_spb_version, isc_spb_current_version, isc_spb_user_name, (char)ulen,
-		user, isc_spb_password, (char)plen, pass, host);
+	if (ulen > 63) {
+		_php_ibase_module_error("Internal error: dba_username too long");
+		RETURN_FALSE;
+	}
 
-	if (spb_len > sizeof(buf) || spb_len == -1) {
-		_php_ibase_module_error("Internal error: insufficient buffer space for SPB (%zd)", spb_len);
+	if (plen > 255) {
+		_php_ibase_module_error("Internal error: dba_password too long");
+		RETURN_FALSE;
+	}
+
+	// 13 = strlen(":service_mgr") + \0;
+	if (hlen + 13 > sizeof(loc)) {
+		_php_ibase_module_error("Internal error: insufficient buffer space for name of the service (%zd)", hlen + 13);
 		RETURN_FALSE;
 	}
 
-	spb_len -= hlen + 12;
-	loc = buf + spb_len; /* points to %s:service_mgr part */
+	buf[p++] = isc_spb_version;
+	buf[p++] = isc_spb_current_version;
+
+	if(ulen > 0){
+		buf[p++] = isc_spb_user_name;
+		buf[p++] = (char)ulen;
+		memcpy(&buf[p], &user, ulen);
+		p += ulen;
+	}
+
+	if(plen > 0){
+		buf[p++] = isc_spb_password;
+		buf[p++] = (char)plen;
+		memcpy(&buf[p], &pass, plen);
+		p += plen;
+	}
+
+	if(hlen > 0){
+		slprintf(loc, sizeof(loc), "%s:service_mgr", host);
+	}
 
 	/* attach to the service manager */
-	if (isc_service_attach(IB_STATUS, 0, loc, &handle, (unsigned short)spb_len, buf)) {
+	if (isc_service_attach(IB_STATUS, 0, loc, &handle, p, buf)) {
 		_php_ibase_error();
 		RETURN_FALSE;
 	}

interbase.c

@@ -256,7 +256,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_delete_user, 0, 0, 3)
 	ZEND_ARG_INFO(0, last_name)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_service_attach, 0, 0, 3)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_service_attach, 0, 0, 0)
 	ZEND_ARG_INFO(0, host)
 	ZEND_ARG_INFO(0, dba_username)
 	ZEND_ARG_INFO(0, dba_password)