FGFS-4.1/simgear
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#587: don't crash on negative sizes

Browse Source
This commit is contained in:
ThorstenB 2012-01-09 20:21:28 +01:00
parent a89b9f6158
commit 5923956045
5 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
simgear/nasal/code.c
View File

@ -269,7 +269,7 @@ static void setupArgs(naContext ctx, struct Frame* f, naRef* args, int nargs)
args += c->nOptArgs; args += c->nOptArgs;
if(c->needArgVector || nargs > 0) { if(c->needArgVector || nargs > 0) {
naRef argv = naNewVector(ctx); naRef argv = naNewVector(ctx);
naVec_setsize(argv, nargs > 0 ? nargs : 0); naVec_setsize(ctx, argv, nargs > 0 ? nargs : 0);
for(i=0; i<nargs; i++) for(i=0; i<nargs; i++)
PTR(argv).vec->rec->array[i] = *args++; PTR(argv).vec->rec->array[i] = *args++;
naiHash_newsym(PTR(f->locals).hash, &c->constants[c->restArgSym], &argv); naiHash_newsym(PTR(f->locals).hash, &c->constants[c->restArgSym], &argv);
@ -349,7 +349,7 @@ static naRef evalCat(naContext ctx, naRef l, naRef r)
if(IS_VEC(l) && IS_VEC(r)) { if(IS_VEC(l) && IS_VEC(r)) {
int i, ls = naVec_size(l), rs = naVec_size(r); int i, ls = naVec_size(l), rs = naVec_size(r);
naRef v = naNewVector(ctx); naRef v = naNewVector(ctx);
naVec_setsize(v, ls + rs); naVec_setsize(ctx, v, ls + rs);
for(i=0; i<ls; i+=1) naVec_set(v, i, naVec_get(l, i)); for(i=0; i<ls; i+=1) naVec_set(v, i, naVec_get(l, i));
for(i=0; i<rs; i+=1) naVec_set(v, i+ls, naVec_get(r, i)); for(i=0; i<rs; i+=1) naVec_set(v, i+ls, naVec_get(r, i));
return v; return v;

2
simgear/nasal/iolib.c
View File

@ -228,7 +228,7 @@ static naRef f_stat(naContext ctx, naRef me, int argc, naRef* args)
naRuntimeError(ctx, strerror(errno)); naRuntimeError(ctx, strerror(errno));
} }
result = naNewVector(ctx); result = naNewVector(ctx);
naVec_setsize(result, 12); naVec_setsize(ctx, result, 12);
#define FLD(x) naVec_set(result, n++, naNum(s.st_##x)); #define FLD(x) naVec_set(result, n++, naNum(s.st_##x));
FLD(dev); FLD(ino); FLD(mode); FLD(nlink); FLD(uid); FLD(gid); FLD(dev); FLD(ino); FLD(mode); FLD(nlink); FLD(uid); FLD(gid);
FLD(rdev); FLD(size); FLD(atime); FLD(mtime); FLD(ctime); FLD(rdev); FLD(size); FLD(atime); FLD(mtime); FLD(ctime);

6
simgear/nasal/lib.c
View File

@ -56,7 +56,7 @@ static naRef f_pop(naContext c, naRef me, int argc, naRef* args)
static naRef f_setsize(naContext c, naRef me, int argc, naRef* args) static naRef f_setsize(naContext c, naRef me, int argc, naRef* args)
{ {
if(argc < 2 || !naIsVector(args[0])) ARGERR(); if(argc < 2 || !naIsVector(args[0])) ARGERR();
naVec_setsize(args[0], (int)naNumValue(args[1]).num); naVec_setsize(c, args[0], (int)naNumValue(args[1]).num);
return args[0]; return args[0];
} }
@ -74,7 +74,7 @@ static naRef f_subvec(naContext c, naRef me, int argc, naRef* args)
if(naIsNil(nlen) || len > naVec_size(v) - start) if(naIsNil(nlen) || len > naVec_size(v) - start)
len = naVec_size(v) - start; len = naVec_size(v) - start;
result = naNewVector(c); result = naNewVector(c);
naVec_setsize(result, len); naVec_setsize(c, result, len);
for(i=0; i<len; i++) for(i=0; i<len; i++)
naVec_set(result, i, naVec_get(v, start + i)); naVec_set(result, i, naVec_get(v, start + i));
return result; return result;
@ -533,7 +533,7 @@ static naRef f_sort(naContext c, naRef me, int argc, naRef* args)
qsort(sd.recs, sd.n, sizeof(sd.recs[0]), qsort(sd.recs, sd.n, sizeof(sd.recs[0]),
(int(*)(const void*,const void*))sortcmp); (int(*)(const void*,const void*))sortcmp);
out = naNewVector(c); out = naNewVector(c);
naVec_setsize(out, sd.n); naVec_setsize(c, out, sd.n);
for(i=0; i<sd.n; i++) for(i=0; i<sd.n; i++)
PTR(out).vec->rec->array[i] = sd.elems[sd.recs[i].i]; PTR(out).vec->rec->array[i] = sd.elems[sd.recs[i].i];
naFree(sd.recs); naFree(sd.recs);

2
simgear/nasal/nasal.h
View File

@ -166,7 +166,7 @@ naRef naVec_get(naRef v, int i);
void naVec_set(naRef vec, int i, naRef o); void naVec_set(naRef vec, int i, naRef o);
int naVec_append(naRef vec, naRef o); int naVec_append(naRef vec, naRef o);
naRef naVec_removelast(naRef vec); naRef naVec_removelast(naRef vec);
void naVec_setsize(naRef vec, int sz); void naVec_setsize(naContext c, naRef vec, int sz);
// Hash utilities: // Hash utilities:
int naHash_size(naRef h); int naHash_size(naRef h);

23
simgear/nasal/vector.c
View File

@ -69,16 +69,21 @@ int naVec_append(naRef vec, naRef o)
return 0; return 0;
} }
void naVec_setsize(naRef vec, int sz) void naVec_setsize(naContext c, naRef vec, int sz)
{ {
int i; if (sz < 0)
struct VecRec* v = PTR(vec).vec->rec; naRuntimeError(c, "size cannot be negative");
struct VecRec* nv = naAlloc(sizeof(struct VecRec) + sizeof(naRef) * sz); else
nv->size = sz; {
nv->alloced = sz; int i;
for(i=0; i<sz; i++) struct VecRec* v = PTR(vec).vec->rec;
nv->array[i] = (v && i < v->size) ? v->array[i] : naNil(); struct VecRec* nv = naAlloc(sizeof(struct VecRec) + sizeof(naRef) * sz);
naGC_swapfree((void*)&(PTR(vec).vec->rec), nv); nv->size = sz;
nv->alloced = sz;
for(i=0; i<sz; i++)
nv->array[i] = (v && i < v->size) ? v->array[i] : naNil();
naGC_swapfree((void*)&(PTR(vec).vec->rec), nv);
}
} }
naRef naVec_removelast(naRef vec) naRef naVec_removelast(naRef vec)