From 6c4eb13453184c70239c9c9b874ccab495741497 Mon Sep 17 00:00:00 2001 From: ai4rei Date: Tue, 23 Nov 2010 11:56:44 +0000 Subject: * Labels longer than 23 characters will no longer cause the server to exit immediately (bugreport:4563, since r1213). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14494 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/npc.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/map/npc.c b/src/map/npc.c index 95981ad55..dcfa52193 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -1940,14 +1940,6 @@ int npc_convertlabel_db(DBKey key, void* data, va_list ap) nullpo_ret(label_list_num = va_arg(ap,int*)); nullpo_ret(filepath = va_arg(ap,const char*)); - if( *label_list == NULL ) - { - *label_list = (struct npc_label_list *) aCallocA (1, sizeof(struct npc_label_list)); - *label_list_num = 0; - } else - *label_list = (struct npc_label_list *) aRealloc (*label_list, sizeof(struct npc_label_list)*(*label_list_num+1)); - label = *label_list+*label_list_num; - // In case of labels not terminated with ':', for user defined function support p = lname; while( ISALNUM(*p) || *p == '_' ) @@ -1958,8 +1950,17 @@ int npc_convertlabel_db(DBKey key, void* data, va_list ap) if( len > 23 ) { ShowError("npc_parse_script: label name longer than 23 chars! '%s'\n (%s)", lname, filepath); - exit(EXIT_FAILURE); + return 0; } + + if( *label_list == NULL ) + { + *label_list = (struct npc_label_list *) aCallocA (1, sizeof(struct npc_label_list)); + *label_list_num = 0; + } else + *label_list = (struct npc_label_list *) aRealloc (*label_list, sizeof(struct npc_label_list)*(*label_list_num+1)); + label = *label_list+*label_list_num; + safestrncpy(label->name, lname, sizeof(label->name)); label->pos = lpos; ++(*label_list_num); -- cgit v1.2.3-60-g2f50