Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed clif_party_message using an incorrect buffer length

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9845 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
ultramage 2007-02-11 00:16:06 +00:00
parent 79fd4cb7be
commit 1ad9bb7c15
2 changed files with 31 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog-Trunk.txt
View File

@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2007/02/10 2007/02/10
* Fixed clif_party_message using an incorrect buffer length [ultramage]
* Cosmetic changes to the buildin section of script.c (use defines for * Cosmetic changes to the buildin section of script.c (use defines for
function names/definitions). [FlavioJS] function names/definitions). [FlavioJS]
2007/02/09 2007/02/09

58
src/map/clif.c
View File

@ -5727,40 +5727,42 @@ int clif_party_join_info(struct party *p, struct map_session_data *sd)
/*========================================== /*==========================================
* パーティ情報送信 * Sends party information
*------------------------------------------ * R 00fb <len>.w <party name>.24B {<ID>.l <nick>.24B <map name>.16B <leader>.B <offline>.B}.46B*
*/ *------------------------------------------*/
int clif_party_info(struct party_data *p,int fd) int clif_party_info(struct party_data* p, int fd)
{ {
unsigned char buf[1024]; unsigned char buf[2+2+NAME_LENGTH+(4+NAME_LENGTH+MAP_NAME_LENGTH+1+1)*MAX_PARTY];
int i,c; struct map_session_data* sd = NULL;
struct map_session_data *sd=NULL; int i, c;
nullpo_retr(0, p); nullpo_retr(0, p);
WBUFW(buf,0)=0xfb; WBUFW(buf,0) = 0xfb;
memcpy(WBUFP(buf,4),p->party.name,NAME_LENGTH); memcpy(WBUFP(buf,4), p->party.name, NAME_LENGTH);
for(i=c=0;i<MAX_PARTY;i++){ for(i = 0, c = 0; i < MAX_PARTY; i++)
struct party_member *m=&p->party.member[i]; {
if(!m->account_id) struct party_member* m = &p->party.member[i];
continue; if(!m->account_id) continue;
if(sd==NULL) sd=p->data[i].sd;
WBUFL(buf,28+c*46)=m->account_id; if(sd == NULL) sd = p->data[i].sd; // need at least one member's 'sd' so clif_send() can identify the party
memcpy(WBUFP(buf,28+c*46+ 4),m->name,NAME_LENGTH);
memcpy(WBUFP(buf,28+c*46+28),mapindex_id2name(m->map),MAP_NAME_LENGTH); WBUFL(buf,28+c*46) = m->account_id;
WBUFB(buf,28+c*46+44)=(m->leader)?0:1; memcpy(WBUFP(buf,28+c*46+4), m->name, NAME_LENGTH);
WBUFB(buf,28+c*46+45)=(m->online)?0:1; memcpy(WBUFP(buf,28+c*46+28), mapindex_id2name(m->map), MAP_NAME_LENGTH);
WBUFB(buf,28+c*46+44) = (m->leader) ? 0 : 1;
WBUFB(buf,28+c*46+45) = (m->online) ? 0 : 1;
c++; c++;
} }
WBUFW(buf,2)=28+c*46; WBUFW(buf,2) = 28+c*46;
if(fd>=0){ // fdが設定されてるならそれに送る
WFIFOHEAD(fd, 28+c*46); if(fd >= 0) // send only to self
memcpy(WFIFOP(fd,0),buf,WBUFW(buf,2)); if (session[fd] && session[fd]->session_data)
WFIFOSET(fd,WFIFOW(fd,2)); clif_send(buf, WBUFW(buf,2), &((struct map_session_data *)session[fd]->session_data)->bl, SELF);
return 9; else // send to whole party
} if(sd)
if(sd!=NULL) clif_send(buf, WBUFW(buf,2), &sd->bl, PARTY);
clif_send(buf,WBUFW(buf,2),&sd->bl,PARTY);
return 0; return 0;
} }
/*========================================== /*==========================================