summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/map/clif.c2
-rw-r--r--src/map/status.c4
3 files changed, 5 insertions, 3 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index c203654eb..5d2a7c483 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -5,6 +5,8 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. EV
GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS
2006/03/14
+ * Fixed a possible crash in Venom Splasher if the countdown is too high.
+ [Skotlex]
* Fixed skill_notok blocking guild skills [Skotlex]
* Fixed Napalm vulcan's time2 entry in the skill_cast_db [Skotlex]
* Fixed the average_lv column size specification for levels above 255.
diff --git a/src/map/clif.c b/src/map/clif.c
index 074f918ab..ac7c73ef5 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -320,7 +320,7 @@ int clif_send_sub(struct block_list *bl, va_list ap)
//it's being received by everyone. [Skotlex]
if ((sd->special_state.intravision || sd->sc.data[SC_INTRAVISION].timer != -1 ) && bl != src_bl) {
struct status_change *sc = status_get_sc(src_bl);
- if(sc && (sc->option)&(OPTION_HIDE|OPTION_CLOAK))
+ if(sc && (sc->option&(OPTION_HIDE|OPTION_CLOAK)))
{ //option̏C
switch(((unsigned short*)buf)[0])
{
diff --git a/src/map/status.c b/src/map/status.c
index 548be4d1f..48d762900 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -5503,8 +5503,8 @@ int status_change_timer(int tid, unsigned int tick, int id, int data)
case SC_SPLASHER:
if (sc->data[type].val4 % 1000 == 0) {
- char timer[2];
- sprintf (timer, "%d", sc->data[type].val4/1000);
+ char timer[10];
+ snprintf (timer, 10, "%d", sc->data[type].val4/1000);
clif_message(bl, timer);
}
if((sc->data[type].val4 -= 500) > 0) {