void Write_NoFormat(int sock, const char *text)
{
- if ((sock < 0) || (!text))
+ if ((sock < 0) || (!text) || (sock > MAX_DESCRIPTORS))
return;
char tb[MAXBUF];
void Write(int sock,char *text, ...)
{
- if (sock < 0)
+ if ((sock < 0) || (sock > MAX_DESCRIPTORS))
return;
if (!text)
{
void WriteServ_NoFormat(int sock, const char* text)
{
- if ((sock < 0) || (!text))
+ if ((sock < 0) || (!text) || (sock > MAX_DESCRIPTORS))
return;
char tb[MAXBUF];
int bytes = snprintf(tb,MAXBUF,":%s %s\r\n",Config->ServerName,text);
void WriteServ(int sock, char* text, ...)
{
- if (sock < 0)
+ if ((sock < 0) || (sock > MAX_DESCRIPTORS))
return;
if (!text)
{
void WriteFrom_NoFormat(int sock, userrec *user, const char* text)
{
- if ((sock < 0) || (!text) || (!user))
+ if ((sock < 0) || (!text) || (!user) || (sock > MAX_DESCRIPTORS))
return;
char tb[MAXBUF];
int bytes = snprintf(tb,MAXBUF,":%s %s\r\n",user->GetFullHost(),text);
void WriteFrom(int sock, userrec *user,char* text, ...)
{
- if (sock < 0)
+ if ((sock < 0) || (sock > MAX_DESCRIPTORS))
return;
if ((!text) || (!user))
{
switch (status)
{
case '@':
- Ptr->GetOppedUsers();
+ ulist = Ptr->GetOppedUsers();
break;
case '%':
- Ptr->GetHalfoppedUsers();
+ ulist = Ptr->GetHalfoppedUsers();
break;
case '+':
- Ptr->GetVoicedUsers();
+ ulist = Ptr->GetVoicedUsers();
break;
default:
- Ptr->GetUsers();
+ ulist = Ptr->GetUsers();
break;
}
+ log(DEBUG,"%d users to write to",ulist->size());
for (std::map<char*,char*>::iterator i = ulist->begin(); i != ulist->end(); i++)
{
char* o = i->second;
switch (status)
{
case '@':
- Ptr->GetOppedUsers();
+ ulist = Ptr->GetOppedUsers();
break;
case '%':
- Ptr->GetHalfoppedUsers();
+ ulist = Ptr->GetHalfoppedUsers();
break;
case '+':
- Ptr->GetVoicedUsers();
+ ulist = Ptr->GetVoicedUsers();
break;
default:
- Ptr->GetUsers();
+ ulist = Ptr->GetUsers();
break;
}
for (std::map<char*,char*>::iterator i = ulist->begin(); i != ulist->end(); i++)