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

* Fixed a deallocation mistake and some buffer overflows in npc_chat.c after doing rtfm@pcre.txt (all caused by incorrect usage of pcre api)

Browse Source 
* Removed underscores in npc_chat.c's variable names (easier to read)
* Reindented the whole thing (used spaces half of the time ._.)
* Moved npc pcre-data deallocation from npc_remove_map to npc_unload

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11036 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
ultramage 2007-08-19 06:04:34 +00:00
parent 1518e0240b
commit 97e812dda1
6 changed files with 365 additions and 426 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Changelog-Trunk.txt
View File

@ -3,6 +3,11 @@ Date Added
AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2007/08/18
* Fixed a deallocation mistake and some buffer overflows in npc_chat.c
after doing rtfm@pcre.txt (all caused by incorrect usage of pcre api)
* Removed underscores in npc_chat.c's variable names (easier to read)
* Moved npc pcre-data deallocation from npc_remove_map to npc_unload
2007/08/17
* Implemented the official dual-wield aspd equation [ultramage]
- using 0.7 instead of 0.66 as modifier (so aspd will be lower now)

11
conf-tmpl/charcommand_athena.conf
View File

@ -1,13 +1,13 @@
// Athena charcommand Configuration file.
// Translated by Peter Kieser <pfak@telus.net>
// Set here the symbol that you want to use for your commands
// Only 1 character is get (default is '#'). You can set any character,
// except control-character (0x00-0x1f), '%' (party chat speaking),
// '/' (standard ragnarok GM commands) and '@' (Standard GM Commands)
// With default character, all commands begin by a '#', example: #save SomePlayer
// The symbol that will be used to recognize commands.
// You can set any one character, except control-characters (0x00-0x1f),
// '%', '$' (party/guild chat speaking) and '/' (standard client commands).
// The symbol must be different from from the standard GM command symbol.
command_symbol: #
//--------------------------
// 0: normal player commands
// None for security purposes.
@ -90,6 +90,7 @@ size: 50
// Resurrects a dead character
alive: 60
revive: 60
// Give a player all the skills available to him/her
allskill: 60

2
src/map/map.h
View File

@ -844,7 +844,7 @@ struct npc_data {
int eventtimer[MAX_EVENTTIMER];
short arenaflag;
void *chatdb;
void* chatdb; // pointer to a npc_parse struct (see npc_chat.c)
struct npc_data *master_nd;
union {

7
src/map/npc.c
View File

@ -1441,9 +1441,6 @@ int npc_remove_map(struct npc_data* nd)
if(nd->bl.prev == NULL || nd->bl.m < 0)
return 1; //Not assigned to a map.
m = nd->bl.m;
#ifdef PCRE_SUPPORT
npc_chat_finalize(nd);
#endif
clif_clearunit_area(&nd->bl,2);
//Remove corresponding NPC CELLs
if (nd->bl.subtype == WARP) {
@ -1513,6 +1510,10 @@ int npc_unload(struct npc_data* nd)
if (nd->chat_id) // remove npc chatroom object and kick users
chat_deletenpcchat(nd);
#ifdef PCRE_SUPPORT
npc_chat_finalize(nd); // deallocate npc PCRE data structures
#endif
if (nd->bl.subtype == SCRIPT) {
ev_db->foreach(ev_db,npc_unload_ev,nd->exname); //Clean up all events related.
if (nd->u.scr.timerid != -1) {

2
src/map/npc.h
View File

@ -4,6 +4,8 @@
#ifndef _NPC_H_
#define _NPC_H_
#include "map.h" // TBL_NPC
#define START_NPC_NUM 110000000
#define WARP_CLASS 45

338
src/map/npc_chat.c
View File

@ -3,26 +3,21 @@
#ifdef PCRE_SUPPORT
#include "../common/timer.h"
#include "../common/malloc.h"
#include "../common/nullpo.h"
#include "../common/showmsg.h"
#include "../common/strlib.h"
#include "map.h" // struct mob_data, struct npc_data
#include "script.h" // set_var()
#include "pcre.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdarg.h>
#include <time.h>
#include "../common/timer.h"
#include "../common/malloc.h"
#include "../common/version.h"
#include "../common/nullpo.h"
#include "../common/showmsg.h"
#include "map.h"
#include "status.h"
#include "npc.h"
#include "chat.h"
#include "script.h"
#include "battle.h"
#include "pcre.h"
/**
* Written by MouseJstr in a vision... (2/21/2005)
@ -71,24 +66,21 @@
* deletes a pset
*/
/* Structure containing all info associated with a single pattern
block */
/* Structure containing all info associated with a single pattern block */
struct pcrematch_entry {
struct pcrematch_entry *next_;
char *pattern_;
pcre *pcre_;
pcre_extra *pcre_extra_;
char *label_;
struct pcrematch_entry* next;
char* pattern;
pcre* pcre;
pcre_extra* pcre_extra;
char* label;
};
/* A set of patterns that can be activated and deactived with a single
command */
/* A set of patterns that can be activated and deactived with a single command */
struct pcrematch_set {
struct pcrematch_set *next_, *prev_;
struct pcrematch_entry *head_;
int setid_;
struct pcrematch_set* prev;
struct pcrematch_set* next;
struct pcrematch_entry* head;
int setid;
};
/*
@ -100,10 +92,9 @@ struct pcrematch_set {
* also wanted people to be able to grab this one file to get updates
* without having to do a large number of changes.
*/
struct npc_parse {
struct pcrematch_set *active_;
struct pcrematch_set *inactive_;
struct pcrematch_set* active;
struct pcrematch_set* inactive;
};
@ -112,22 +103,12 @@ struct npc_parse {
*
* This does NOT do the list management
*/
void finalize_pcrematch_entry(struct pcrematch_entry* e)
{
//TODO: For some odd reason this causes a already-free'd error under Windows, but not *nix! [Skotlex]
#ifndef _WIN32
if (e->pcre_) {
free(e->pcre_);
e->pcre_ = NULL;
}
#endif
if (e->pcre_extra_) {
free(e->pcre_extra_);
e->pcre_ = NULL;
}
aFree(e->pattern_);
aFree(e->label_);
pcre_free(e->pcre);
pcre_free(e->pcre_extra);
aFree(e->pattern);
aFree(e->label);
}
/**
@ -138,34 +119,32 @@ static struct pcrematch_set * lookup_pcreset(struct npc_data *nd,int setid)
struct pcrematch_set *pcreset;
struct npc_parse *npcParse = (struct npc_parse *) nd->chatdb;
if (npcParse == NULL)
nd->chatdb = npcParse = (struct npc_parse *)
aCalloc(sizeof(struct npc_parse), 1);
nd->chatdb = npcParse = (struct npc_parse *) aCalloc(sizeof(struct npc_parse), 1);
pcreset = npcParse->active_;
pcreset = npcParse->active;
while (pcreset != NULL) {
if (pcreset->setid_ == setid)
if (pcreset->setid == setid)
break;
pcreset = pcreset->next_;
pcreset = pcreset->next;
}
if (pcreset == NULL)
pcreset = npcParse->inactive_;
pcreset = npcParse->inactive;
while (pcreset != NULL) {
if (pcreset->setid_ == setid)
if (pcreset->setid == setid)
break;
pcreset = pcreset->next_;
pcreset = pcreset->next;
}
if (pcreset == NULL) {
pcreset = (struct pcrematch_set *)
aCalloc(sizeof(struct pcrematch_set), 1);
pcreset->next_ = npcParse->inactive_;
if (pcreset->next_ != NULL)
pcreset->next_->prev_ = pcreset;
pcreset->prev_ = 0;
npcParse->inactive_ = pcreset;
pcreset->setid_ = setid;
pcreset = (struct pcrematch_set *) aCalloc(sizeof(struct pcrematch_set), 1);
pcreset->next = npcParse->inactive;
if (pcreset->next != NULL)
pcreset->next->prev = pcreset;
pcreset->prev = 0;
npcParse->inactive = pcreset;
pcreset->setid = setid;
}
return pcreset;
@ -176,33 +155,32 @@ static struct pcrematch_set * lookup_pcreset(struct npc_data *nd,int setid)
*
* if the setid does not exist, this will silently return
*/
static void activate_pcreset(struct npc_data* nd, int setid)
{
struct pcrematch_set *pcreset;
struct npc_parse *npcParse = (struct npc_parse *) nd->chatdb;
if (npcParse == NULL)
return; // Nothing to activate...
pcreset = npcParse->inactive_;
pcreset = npcParse->inactive;
while (pcreset != NULL) {
if (pcreset->setid_ == setid)
if (pcreset->setid == setid)
break;
pcreset = pcreset->next_;
pcreset = pcreset->next;
}
if (pcreset == NULL)
return; // not in inactive list
if (pcreset->next_ != NULL)
pcreset->next_->prev_ = pcreset->prev_;
if (pcreset->prev_ != NULL)
pcreset->prev_->next_ = pcreset->next_;
if (pcreset->next != NULL)
pcreset->next->prev = pcreset->prev;
if (pcreset->prev != NULL)
pcreset->prev->next = pcreset->next;
else
npcParse->inactive_ = pcreset->next_;
npcParse->inactive = pcreset->next;
pcreset->prev_ = NULL;
pcreset->next_ = npcParse->active_;
if (pcreset->next_ != NULL)
pcreset->next_->prev_ = pcreset;
npcParse->active_ = pcreset;
pcreset->prev = NULL;
pcreset->next = npcParse->active;
if (pcreset->next != NULL)
pcreset->next->prev = pcreset;
npcParse->active = pcreset;
}
/**
@ -210,7 +188,6 @@ static void activate_pcreset(struct npc_data *nd,int setid)
*
* if the setid does not exist, this will silently return
*/
static void deactivate_pcreset(struct npc_data* nd, int setid)
{
struct pcrematch_set *pcreset;
@ -218,30 +195,30 @@ static void deactivate_pcreset(struct npc_data *nd,int setid)
if (npcParse == NULL)
return; // Nothing to deactivate...
if (setid == -1) {
while(npcParse->active_ != NULL)
deactivate_pcreset(nd, npcParse->active_->setid_);
while(npcParse->active != NULL)
deactivate_pcreset(nd, npcParse->active->setid);
return;
}
pcreset = npcParse->active_;
pcreset = npcParse->active;
while (pcreset != NULL) {
if (pcreset->setid_ == setid)
if (pcreset->setid == setid)
break;
pcreset = pcreset->next_;
pcreset = pcreset->next;
}
if (pcreset == NULL)
return; // not in active list
if (pcreset->next_ != NULL)
pcreset->next_->prev_ = pcreset->prev_;
if (pcreset->prev_ != NULL)
pcreset->prev_->next_ = pcreset->next_;
if (pcreset->next != NULL)
pcreset->next->prev = pcreset->prev;
if (pcreset->prev != NULL)
pcreset->prev->next = pcreset->next;
else
npcParse->active_ = pcreset->next_;
npcParse->active = pcreset->next;
pcreset->prev_ = NULL;
pcreset->next_ = npcParse->inactive_;
if (pcreset->next_ != NULL)
pcreset->next_->prev_ = pcreset;
npcParse->inactive_ = pcreset;
pcreset->prev = NULL;
pcreset->next = npcParse->inactive;
if (pcreset->next != NULL)
pcreset->next->prev = pcreset;
npcParse->inactive = pcreset;
}
/**
@ -254,42 +231,42 @@ static void delete_pcreset(struct npc_data *nd,int setid)
struct npc_parse *npcParse = (struct npc_parse *) nd->chatdb;
if (npcParse == NULL)
return; // Nothing to deactivate...
pcreset = npcParse->active_;
pcreset = npcParse->active;
while (pcreset != NULL) {
if (pcreset->setid_ == setid)
if (pcreset->setid == setid)
break;
pcreset = pcreset->next_;
pcreset = pcreset->next;
}
if (pcreset == NULL) {
active = 0;
pcreset = npcParse->inactive_;
pcreset = npcParse->inactive;
while (pcreset != NULL) {
if (pcreset->setid_ == setid)
if (pcreset->setid == setid)
break;
pcreset = pcreset->next_;
pcreset = pcreset->next;
}
}
if (pcreset == NULL)
return;
if (pcreset->next_ != NULL)
pcreset->next_->prev_ = pcreset->prev_;
if (pcreset->prev_ != NULL)
pcreset->prev_->next_ = pcreset->next_;
if (pcreset->next != NULL)
pcreset->next->prev = pcreset->prev;
if (pcreset->prev != NULL)
pcreset->prev->next = pcreset->next;
if(active)
npcParse->active_ = pcreset->next_;
npcParse->active = pcreset->next;
else
npcParse->inactive_ = pcreset->next_;
npcParse->inactive = pcreset->next;
pcreset->prev_ = NULL;
pcreset->next_ = NULL;
pcreset->prev = NULL;
pcreset->next = NULL;
while (pcreset->head_) {
struct pcrematch_entry *n = pcreset->head_->next_;
finalize_pcrematch_entry(pcreset->head_);
aFree(pcreset->head_); // Cleanin' the last ones.. [Lance]
pcreset->head_ = n;
while (pcreset->head) {
struct pcrematch_entry* n = pcreset->head->next;
finalize_pcrematch_entry(pcreset->head);
aFree(pcreset->head); // Cleanin' the last ones.. [Lance]
pcreset->head = n;
}
aFree(pcreset);
@ -300,28 +277,26 @@ static void delete_pcreset(struct npc_data *nd,int setid)
*/
static struct pcrematch_entry* create_pcrematch_entry(struct pcrematch_set* set)
{
struct pcrematch_entry * e = (struct pcrematch_entry *)
aCalloc(sizeof(struct pcrematch_entry), 1);
struct pcrematch_entry * last = set->head_;
struct pcrematch_entry * e = (struct pcrematch_entry *) aCalloc(sizeof(struct pcrematch_entry), 1);
struct pcrematch_entry * last = set->head;
// Normally we would have just stuck it at the end of the list but
// this doesn't sink up with peoples usage pattern. They wanted
// the items defined first to have a higher priority then the
// items defined later.. as a result, we have to do some work up
// front..
// items defined later. as a result, we have to do some work up front.
/* if we are the first pattern, stick us at the end */
if (last == NULL) {
set->head_ = e;
set->head = e;
return e;
}
/* Look for the last entry */
while (last->next_ != NULL)
last = last->next_;
while (last->next != NULL)
last = last->next;
last->next_ = e;
e->next_ = NULL;
last->next = e;
e->next = NULL;
return e;
}
@ -329,19 +304,17 @@ static struct pcrematch_entry *create_pcrematch_entry(struct pcrematch_set * set
/**
* define/compile a new pattern
*/
void npc_chat_def_pattern(struct npc_data *nd, int setid,
const char *pattern, const char *label)
void npc_chat_def_pattern(struct npc_data* nd, int setid, const char* pattern, const char* label)
{
const char *err;
int erroff;
struct pcrematch_set * s = lookup_pcreset(nd, setid);
struct pcrematch_entry *e = create_pcrematch_entry(s);
e->pattern_ = aStrdup(pattern);
e->label_ = aStrdup(label);
e->pcre_ = pcre_compile(pattern, PCRE_CASELESS, &err, &erroff, NULL);
e->pcre_extra_ = pcre_study(e->pcre_, 0, &err);
e->pattern = aStrdup(pattern);
e->label = aStrdup(label);
e->pcre = pcre_compile(pattern, PCRE_CASELESS, &err, &erroff, NULL);
e->pcre_extra = pcre_study(e->pcre, 0, &err);
}
/**
@ -356,11 +329,11 @@ void npc_chat_finalize(struct npc_data *nd)
if (npcParse == NULL)
return;
while(npcParse->active_)
delete_pcreset(nd, npcParse->active_->setid_);
while(npcParse->active)
delete_pcreset(nd, npcParse->active->setid);
while(npcParse->inactive_)
delete_pcreset(nd, npcParse->inactive_->setid_);
while(npcParse->inactive)
delete_pcreset(nd, npcParse->inactive->setid);
// Additional cleaning up [Lance]
aFree(npcParse);
@ -374,108 +347,65 @@ int npc_chat_sub(struct block_list *bl, va_list ap)
struct npc_data* nd = (struct npc_data *) bl;
struct npc_parse* npcParse = (struct npc_parse *) nd->chatdb;
char* msg;
int len, pos, i;
int len, i;
struct map_session_data* sd;
struct npc_label_list* lst;
struct pcrematch_set* pcreset;
struct pcrematch_entry* e;
// Not interested in anything you might have to say...
if (npcParse == NULL || npcParse->active_ == NULL)
if (npcParse == NULL || npcParse->active == NULL)
return 0;
msg = va_arg(ap,char*);
len = va_arg(ap,int);
sd = va_arg(ap,struct map_session_data *);
// grab the active list
pcreset = npcParse->active_;
// interate across all active sets
while (pcreset != NULL) {
struct pcrematch_entry *e = pcreset->head_;
// iterate across all active sets
for (pcreset = npcParse->active; pcreset != NULL; pcreset = pcreset->next)
{
// interate across all patterns in that set
while (e != NULL) {
int offsets[20];
char buf[255];
for (e = pcreset->head; e != NULL; e = e->next)
{
int offsets[2*10 + 10]; // 1/3 reserved for temp space requred by pcre_exec
// perform pattern match
int r = pcre_exec(e->pcre_, e->pcre_extra_, msg, len, 0,
0, offsets, sizeof(offsets) / sizeof(offsets[0]));
if (r >= 0) {
int r = pcre_exec(e->pcre, e->pcre_extra, msg, len, 0, 0, offsets, ARRAYLENGTH(offsets));
if (r > 0)
{
// save out the matched strings
switch (r) {
case 10:
memcpy(buf, &msg[offsets[18]], offsets[19]);
buf[offsets[19]] = '\0';
set_var(sd, "$@p9$", buf);
case 9:
memcpy(buf, &msg[offsets[16]], offsets[17]);
buf[offsets[17]] = '\0';
set_var(sd, "$@p8$", buf);
case 8:
memcpy(buf, &msg[offsets[14]], offsets[15]);
buf[offsets[15]] = '\0';
set_var(sd, "$@p7$", buf);
case 7:
memcpy(buf, &msg[offsets[12]], offsets[13]);
buf[offsets[13]] = '\0';
set_var(sd, "$@p6$", buf);
case 6:
memcpy(buf, &msg[offsets[10]], offsets[11]);
buf[offsets[11]] = '\0';
set_var(sd, "$@p5$", buf);
case 5:
memcpy(buf, &msg[offsets[8]], offsets[9]);
buf[offsets[9]] = '\0';
set_var(sd, "$@p4$", buf);
case 4:
memcpy(buf, &msg[offsets[6]], offsets[7]);
buf[offsets[7]] = '\0';
set_var(sd, "$@p3$", buf);
case 3:
memcpy(buf, &msg[offsets[4]], offsets[5]);
buf[offsets[5]] = '\0';
set_var(sd, "$@p2$", buf);
case 2:
memcpy(buf, &msg[offsets[2]], offsets[3]);
buf[offsets[3]] = '\0';
set_var(sd, "$@p1$", buf);
case 1:
memcpy(buf, &msg[offsets[0]], offsets[1]);
buf[offsets[1]] = '\0';
set_var(sd, "$@p0$", buf);
for (i = 0; i < r; i++)
{
char var[6], val[255];
snprintf(var, sizeof(var), "$@p%i$", i);
pcre_copy_substring(msg, offsets, r, i, val, sizeof(val));
set_var(sd, var, val);
}
// find the target label.. this sucks..
lst = nd->u.scr.label_list;
pos = -1;
for (i = 0; i < nd->u.scr.label_list_num; i++) {
if (strncmp(lst[i].name, e->label_, sizeof(lst[i].name)) == 0) {
pos = lst[i].pos;
break;
}
}
if (pos == -1) {
ShowWarning("Unable to find label: %s", e->label_);
// unable to find label... do something..
ARR_FIND(0, nd->u.scr.label_list_num, i, strncmp(lst[i].name, e->label, sizeof(lst[i].name)) == 0);
if (i == nd->u.scr.label_list_num) {
ShowWarning("Unable to find label: %s", e->label);
return 0;
}
// run the npc script
run_script(nd->u.scr.script,pos,sd->bl.id,nd->bl.id);
run_script(nd->u.scr.script,lst[i].pos,sd->bl.id,nd->bl.id);
return 0;
}
e = e->next_;
}
pcreset = pcreset->next_;
}
return 0;
}
int mob_chat_sub(struct block_list *bl, va_list ap){
int mob_chat_sub(struct block_list* bl, va_list ap)
{
struct mob_data *md = (struct mob_data *)bl;
if(md->nd){
if(md->nd)
npc_chat_sub(&md->nd->bl, ap);
}
return 0;
}