summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Changelog-Trunk.txt3
-rw-r--r--db/Changelog.txt1
-rw-r--r--db/mob_skill_db.txt10
-rw-r--r--src/char/char.c4
-rw-r--r--src/char_sql/char.c2
-rw-r--r--src/common/mapindex.c17
-rw-r--r--src/map/atcommand.c2
-rw-r--r--src/map/skill.c5
8 files changed, 23 insertions, 21 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index c3e6c3969..b9207e0ca 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -5,6 +5,9 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2007/04/07
+ * Fixed the start_point setting smashing t3h stack in some situations
+ * Fixed some over/under-dimensioned arrays (the map length defines already reserve space for the string terminator)
+ * Fixed an unupdated define making Warp Portal fail with an error [ultramage]
* Final touches to the whole map crap [DracoRPG]
- changed MAP_NAME_LENGTH to 12, now there's MAP_NAME_LENGTH_EXT at 16 for
uses where there is / may be the .gat extension, code adjusted accordingly
diff --git a/db/Changelog.txt b/db/Changelog.txt
index 89c357ecc..2a6e4b544 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -21,6 +21,7 @@
========================
04/07
+ * Fixed Galion's mob skills (remnants of copy-paste) [ultramage]
* Updated map index and map cache with Nameless Island maps [DracoRPG]
- also removed the duplicate g_room2 entry from map index, read the note
* Corrected Aliza card's item_db line. [Skotlex]
diff --git a/db/mob_skill_db.txt b/db/mob_skill_db.txt
index ff89a41a7..76f96c071 100644
--- a/db/mob_skill_db.txt
+++ b/db/mob_skill_db.txt
@@ -4146,11 +4146,11 @@
1791,Galion@NPC_COMBOATTACK,chase,171,2,1000,0,5000,yes,target,always,0,,,,,,
1791,Galion@AS_SONICBLOW,attack,136,5,1000,0,5000,yes,target,always,0,,,,,,
1791,Galion@AS_SONICBLOW,chase,136,5,1000,0,5000,yes,target,always,0,,,,,,
-1783,Galion@NPC_WINDATTACK,attack,187,3,2000,0,5000,yes,target,always,0,,,,,,
-1783,Galion@NPC_WINDATTACK,chase,187,3,2000,0,5000,yes,target,always,0,,,,,,
-1783,Galion@NPC_DARKNESSATTACK,attack,190,3,2000,0,5000,yes,target,always,0,,,,,,
-1783,Galion@NPC_DARKNESSATTACK,chase,190,3,2000,0,5000,yes,target,always,0,,,,,,
-1783,Galion@NPC_CHANGEDARKNESS,attack,168,1,1000,0,5000,no,self,always,0,,,,,,
+1791,Galion@NPC_WINDATTACK,attack,187,3,2000,0,5000,yes,target,always,0,,,,,,
+1791,Galion@NPC_WINDATTACK,chase,187,3,2000,0,5000,yes,target,always,0,,,,,,
+1791,Galion@NPC_DARKNESSATTACK,attack,190,3,2000,0,5000,yes,target,always,0,,,,,,
+1791,Galion@NPC_DARKNESSATTACK,chase,190,3,2000,0,5000,yes,target,always,0,,,,,,
+1791,Galion@NPC_CHANGEDARKNESS,attack,168,1,1000,0,5000,no,self,always,0,,,,,,
1793,Megalith@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,0,9,,,,,
1794,Roween@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,0,22,,,,,
1794,Roween@NPC_COMBOATTACK,attack,171,4,1000,0,5000,yes,target,always,0,,,,,,
diff --git a/src/char/char.c b/src/char/char.c
index 46379bf30..a9c9532e1 100644
--- a/src/char/char.c
+++ b/src/char/char.c
@@ -4152,9 +4152,9 @@ int char_config_read(const char *cfgName) {
} else if (strcmpi(w1, "save_log") == 0) {
save_log = config_switch(w2);
} else if (strcmpi(w1, "start_point") == 0) {
- char map[MAP_NAME_LENGTH];
+ char map[MAP_NAME_LENGTH_EXT];
int x, y;
- if (sscanf(w2, "%16[^,],%d,%d", map, &x, &y) < 3)
+ if (sscanf(w2, "%15[^,],%d,%d", map, &x, &y) < 3)
continue;
start_point.map = mapindex_name2id(map);
if (!start_point.map) {
diff --git a/src/char_sql/char.c b/src/char_sql/char.c
index a0c780cb9..f7b97bc7a 100644
--- a/src/char_sql/char.c
+++ b/src/char_sql/char.c
@@ -4025,7 +4025,7 @@ int char_config_read(const char *cfgName) {
} else if (strcmpi(w1, "start_point") == 0) {
char map[MAP_NAME_LENGTH_EXT];
int x, y;
- if (sscanf(w2, "%16[^,],%d,%d", map, &x, &y) < 3)
+ if (sscanf(w2, "%15[^,],%d,%d", map, &x, &y) < 3)
continue;
start_point.map = mapindex_name2id(map);
if (!start_point.map)
diff --git a/src/common/mapindex.c b/src/common/mapindex.c
index cc847e538..b8bb12c18 100644
--- a/src/common/mapindex.c
+++ b/src/common/mapindex.c
@@ -12,9 +12,8 @@
#define MAX_MAPINDEX 2000
-//Leave an extra char of space to hold the terminator, in case for the strncpy(mapindex_id2name()) calls.
struct indexes {
- char name[MAP_NAME_LENGTH+1]; //Stores map name
+ char name[MAP_NAME_LENGTH]; //Stores map name
char exists; //Set to 1 if index exists
} indexes[MAX_MAPINDEX];
@@ -42,14 +41,14 @@ char *mapindex_normalize_name(char *mapname)
/// Returns 1 if successful, 0 oherwise
int mapindex_addmap(int index, const char *name)
{
- char map_name[1024];
+ char map_name[MAP_NAME_LENGTH_EXT];
if (index < 0 || index >= MAX_MAPINDEX) {
ShowError("(mapindex_add) Map index (%d) for \"%s\" out of range (max is %d)\n", index, name, MAX_MAPINDEX);
return 0;
}
- snprintf(map_name, 1024, "%s", name);
+ snprintf(map_name, MAP_NAME_LENGTH_EXT, "%s", name);
mapindex_normalize_name(map_name);
if (strlen(map_name) > MAP_NAME_LENGTH-1) {
@@ -60,7 +59,7 @@ int mapindex_addmap(int index, const char *name)
if (indexes[index].exists)
ShowWarning("(mapindex_add) Overriding index %d: map \"%s\" -> \"%s\"\n", index, indexes[index].name, map_name);
- strncpy(indexes[index].name, map_name, MAP_NAME_LENGTH);
+ snprintf(indexes[index].name, MAP_NAME_LENGTH, "%s", map_name);
indexes[index].exists = 1;
if (max_index <= index)
max_index = index+1;
@@ -70,9 +69,9 @@ int mapindex_addmap(int index, const char *name)
unsigned short mapindex_name2id(const char* name) {
//TODO: Perhaps use a db to speed this up? [Skotlex]
int i;
- char map_name[1024];
+ char map_name[MAP_NAME_LENGTH_EXT];
- snprintf(map_name, 1024, "%s", name);
+ snprintf(map_name, MAP_NAME_LENGTH_EXT, "%s", name);
mapindex_normalize_name(map_name);
for (i = 1; i < max_index; i++)
@@ -107,7 +106,7 @@ void mapindex_init(void) {
char line[1024];
int last_index = -1;
int index;
- char map_name[1024];
+ char map_name[1024]; // only MAP_NAME_LENGTH(_EXT) under safe conditions
memset (&indexes, 0, sizeof (indexes));
fp=fopen(mapindex_cfgfile,"r");
@@ -119,7 +118,7 @@ void mapindex_init(void) {
if(line[0] == '/' && line[1] == '/')
continue;
- switch (sscanf(line,"%1000s\t%d",map_name,&index)) {
+ switch (sscanf(line,"%s\t%d",map_name,&index)) {
case 1: //Map with no ID given, auto-assign
index = last_index+1;
case 2: //Map with ID given
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 2ce3009eb..916bf2387 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -5433,7 +5433,7 @@ int atcommand_mapinfo(const int fd, struct map_session_data* sd, const char* com
if (atcmd_player_name[0] == '\0') {
memcpy(atcmd_player_name, mapindex_id2name(sd->mapindex), MAP_NAME_LENGTH_EXT);
- atcmd_player_name[MAP_NAME_LENGTH_EXT] = '\0';
+ atcmd_player_name[MAP_NAME_LENGTH_EXT-1] = '\0';
m_id = map_mapindex2mapid(sd->mapindex);
} else {
m_id = map_mapname2mapid(atcmd_player_name);
diff --git a/src/map/skill.c b/src/map/skill.c
index b44219db1..0bd3f288e 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -6095,8 +6095,7 @@ int skill_castend_pos2 (struct block_list *src, int x, int y, int skillid, int s
if (skilllv>3 && sd->status.memo_point[2].map)
snprintf(memo[3], MAP_NAME_LENGTH_EXT, "%s.gat", mapindex_id2name(sd->status.memo_point[2].map));
- clif_skill_warppoint(sd,skillid,skilllv,
- memo[0],memo[1],memo[2],memo[3]);
+ clif_skill_warppoint(sd,skillid,skilllv, memo[0],memo[1],memo[2],memo[3]);
}
break;
@@ -6314,7 +6313,7 @@ int skill_castend_map (struct map_session_data *sd, int skill_num, const char *m
if( skill_num != sd->menuskill_id)
return 0;
- if (strlen(map) > MAP_NAME_LENGTH-1)
+ if (strlen(map) > MAP_NAME_LENGTH_EXT-1)
{ //Map_length check, as it is sent by the client and we shouldn't trust it [Skotlex]
if (battle_config.error_log)
ShowError("skill_castend_map: Received map name '%s' too long!\n", map);
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-12-15 03:44:18 +0000