fte/fteqw
2
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

Attempt to make use of 'len' in NET_AdrToString.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3003 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Molgrum 2008-06-08 20:20:11 +00:00
parent 33140dbf24
commit 6602ffed84
1 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
engine/common/net_wins.c
View file

@ -327,7 +327,7 @@ char *NET_AdrToString (char *s, int len, netadr_t a)
{ {
case NA_BROADCAST_IP: case NA_BROADCAST_IP:
case NA_IP: case NA_IP:
sprintf (s, "%i.%i.%i.%i:%i", snprintf (s, len, "%i.%i.%i.%i:%i",
a.address.ip[0], a.address.ip[0],
a.address.ip[1], a.address.ip[1],
a.address.ip[2], a.address.ip[2],
@ -339,7 +339,7 @@ char *NET_AdrToString (char *s, int len, netadr_t a)
case NA_IPV6: case NA_IPV6:
doneblank = false; doneblank = false;
p = s; p = s;
sprintf (s, "["); snprintf (s, len-strlen(s), "[");
p += strlen(p); p += strlen(p);
for (i = 0; i < 16; i+=2) for (i = 0; i < 16; i+=2)
@ -348,7 +348,7 @@ char *NET_AdrToString (char *s, int len, netadr_t a)
{ {
if (!doneblank) if (!doneblank)
{ {
sprintf (p, "::"); snprintf (p, len-strlen(s), "::");
p += strlen(p); p += strlen(p);
doneblank = 2; doneblank = 2;
} }
@ -359,32 +359,32 @@ char *NET_AdrToString (char *s, int len, netadr_t a)
doneblank = true; doneblank = true;
else if (i != 0) else if (i != 0)
{ {
sprintf (p, ":"); snprintf (p, len-strlen(s), ":");
p += strlen(p); p += strlen(p);
} }
if (a.address.ip6[i+0]) if (a.address.ip6[i+0])
{ {
sprintf (p, "%x%02x", snprintf (p, len-strlen(s), "%x%02x",
a.address.ip6[i+0], a.address.ip6[i+0],
a.address.ip6[i+1]); a.address.ip6[i+1]);
} }
else else
{ {
sprintf (p, "%x", snprintf (p, len-strlen(s), "%x",
a.address.ip6[i+1]); a.address.ip6[i+1]);
} }
p += strlen(p); p += strlen(p);
} }
} }
sprintf (p, "]:%i", snprintf (p, len-strlen(s), "]:%i",
ntohs(a.port)); ntohs(a.port));
break; break;
#endif #endif
#ifdef USEIPX #ifdef USEIPX
case NA_BROADCAST_IPX: case NA_BROADCAST_IPX:
case NA_IPX: case NA_IPX:
sprintf (s, "%02x%02x%02x%02x:%02x%02x%02x%02x%02x%02x:%i", snprintf (s, len, "%02x%02x%02x%02x:%02x%02x%02x%02x%02x%02x:%i",
a.address.ipx[0], a.address.ipx[0],
a.address.ipx[1], a.address.ipx[1],
a.address.ipx[2], a.address.ipx[2],
@ -399,10 +399,10 @@ char *NET_AdrToString (char *s, int len, netadr_t a)
break; break;
#endif #endif
case NA_LOOPBACK: case NA_LOOPBACK:
sprintf (s, "LocalHost"); snprintf (s, len, "LocalHost");
break; break;
default: default:
sprintf (s, "invalid netadr_t type"); snprintf (s, len, "invalid netadr_t type");
// Sys_Error("NET_AdrToString: Bad netadr_t type"); // Sys_Error("NET_AdrToString: Bad netadr_t type");
} }
@ -418,7 +418,7 @@ char *NET_BaseAdrToString (char *s, int len, netadr_t a)
{ {
case NA_BROADCAST_IP: case NA_BROADCAST_IP:
case NA_IP: case NA_IP:
sprintf (s, "%i.%i.%i.%i", snprintf (s, len, "%i.%i.%i.%i",
a.address.ip[0], a.address.ip[0],
a.address.ip[1], a.address.ip[1],
a.address.ip[2], a.address.ip[2],
@ -435,7 +435,7 @@ char *NET_BaseAdrToString (char *s, int len, netadr_t a)
{ {
if (!doneblank) if (!doneblank)
{ {
sprintf (p, "::"); snprintf (p, len-strlen(s), "::");
p += strlen(p); p += strlen(p);
doneblank = 2; doneblank = 2;
} }
@ -446,18 +446,18 @@ char *NET_BaseAdrToString (char *s, int len, netadr_t a)
doneblank = true; doneblank = true;
else if (i != 0) else if (i != 0)
{ {
sprintf (p, ":"); snprintf (p, len-strlen(s), ":");
p += strlen(p); p += strlen(p);
} }
if (a.address.ip6[i+0]) if (a.address.ip6[i+0])
{ {
sprintf (p, "%x%02x", snprintf (p, len-strlen(s), "%x%02x",
a.address.ip6[i+0], a.address.ip6[i+0],
a.address.ip6[i+1]); a.address.ip6[i+1]);
} }
else else
{ {
sprintf (p, "%x", snprintf (p, len-strlen(s), "%x",
a.address.ip6[i+1]); a.address.ip6[i+1]);
} }
p += strlen(p); p += strlen(p);
@ -468,7 +468,7 @@ char *NET_BaseAdrToString (char *s, int len, netadr_t a)
#ifdef USEIPX #ifdef USEIPX
case NA_BROADCAST_IPX: case NA_BROADCAST_IPX:
case NA_IPX: case NA_IPX:
sprintf (s, "%02x%02x%02x%02x:%02x%02x%02x%02x%02x%02x", snprintf (s, len, "%02x%02x%02x%02x:%02x%02x%02x%02x%02x%02x",
a.address.ipx[0], a.address.ipx[0],
a.address.ipx[1], a.address.ipx[1],
a.address.ipx[2], a.address.ipx[2],
@ -482,7 +482,7 @@ char *NET_BaseAdrToString (char *s, int len, netadr_t a)
break; break;
#endif #endif
case NA_LOOPBACK: case NA_LOOPBACK:
sprintf (s, "LocalHost"); snprintf (s, len, "LocalHost");
break; break;
default: default:
Sys_Error("NET_BaseAdrToString: Bad netadr_t type"); Sys_Error("NET_BaseAdrToString: Bad netadr_t type");
@ -1086,9 +1086,9 @@ char *NET_AdrToStringMasked (char *s, int len, netadr_t a, netadr_t amask)
i = UniformMaskedBits(amask); i = UniformMaskedBits(amask);
if (i >= 0) if (i >= 0)
sprintf(s, "%s/%i", NET_AdrToString(adr, sizeof(adr), a), i); snprintf(s, len, "%s/%i", NET_AdrToString(adr, sizeof(adr), a), i);
else else
sprintf(s, "%s/%s", NET_AdrToString(adr, sizeof(adr), a), NET_AdrToString(mask, sizeof(mask), amask)); snprintf(s, len, "%s/%s", NET_AdrToString(adr, sizeof(adr), a), NET_AdrToString(mask, sizeof(mask), amask));
return s; return s;
} }