summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authoramber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-12-26 22:22:17 +0000
committeramber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-12-26 22:22:17 +0000
commitdc1c7d89daaea595ce89f5197317c61ab292c7de (patch)
tree9a1ae90a774d75f73b47acc5a08da470f0470ad1 /src
parent18b0f1eef71423ed6350ef9ed5c2d7e8563ddf0f (diff)
downloadhercules-dc1c7d89daaea595ce89f5197317c61ab292c7de.tar.gz
hercules-dc1c7d89daaea595ce89f5197317c61ab292c7de.tar.bz2
hercules-dc1c7d89daaea595ce89f5197317c61ab292c7de.tar.xz
hercules-dc1c7d89daaea595ce89f5197317c61ab292c7de.zip
update
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@798 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/map/clif.c2
-rw-r--r--src/map/vending.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index ca7e60c6c..acfb5c0ee 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -1820,7 +1820,7 @@ int clif_cutin(struct map_session_data *sd, char *image, int type) {
fd=sd->fd;
WFIFOW(fd,0)=0x1b3;
- memcpy(WFIFOP(fd,2),image,64);
+ strncpy(WFIFOP(fd,2),image,64);
WFIFOB(fd,66)=type;
WFIFOSET(fd,packet_len_table[0x1b3]);
diff --git a/src/map/vending.c b/src/map/vending.c
index a7aa708e5..54af338c1 100644
--- a/src/map/vending.c
+++ b/src/map/vending.c
@@ -154,6 +154,7 @@ void vending_openvending(struct map_session_data *sd,int len,char *message,int f
}
sd->vender_id = sd->bl.id;
sd->vend_num = i;
+ Assert (sd->vend_num < (sizeof (sd->vending) / sizeof(sd->vending[0])));
strcpy(sd->message,message);
if (clif_openvending(sd,sd->vender_id,sd->vending) > 0)
clif_showvendingboard(&sd->bl,message,0);