kai/assaultcube-
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

substr crash fix & simplification

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6361 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
sireus
2011-04-26 14:40:09 +00:00
parent 372755b87c
commit b48939c516
1 changed files with 6 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/command.cpp
+6 -20
View File
@@ -1268,26 +1268,12 @@ int millis_() { extern int totalmillis; return totalmillis; }
void strlen_(char *s) { string r; formatstring(r)("%d", strlen(s)); result(r); }
void substr_(char *fs, char *pa, char *len)
{
int ia = atoi(pa);
int ilen = atoi(len);
string subq;
string subr;
subr[0] = '\0';
if(ia>(int)strlen(fs))
{
return;
}
if(ia>=0)
{
if(!ilen)
{
ilen = strlen(fs)-ia;
}
copystring(subq, fs + ia);
strncpy(subr, subq, ilen);
}
subr[ilen] = '\0';
result(subr);
int ia = atoi(pa);
int ilen = atoi(len);
if(ia>(int)strlen(fs) || ia < 0 || ilen < 0) return;
if(!ilen) ilen = strlen(fs)-ia;
result(newstring(fs + ia, ilen));
}
void l0(int p, int v) { string f; string r; formatstring(f)("%%0%dd", p); formatstring(r)(f, v); result(r); }