bonkmaykr/otyaSMILEBASIC
1
0
Fork 0
Code Activity

Fix array range check

Browse Source
This commit is contained in:
otya128
2016-12-15 00:24:29 +09:00
parent 065f92a775
commit 18ff3016e6
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
SMILEBASIC/type.d
View File

@@ -340,19 +340,19 @@ class Array(T)
ref T opIndex(int i1, int i2) ref T opIndex(int i1, int i2)
{ {
if(dimCount != 2) throw new SyntaxError(); if(dimCount != 2) throw new SyntaxError();
if(i1 >= dim[0] && i2 >= dim[1]) throw new SubscriptOutOfRange(); if(i1 >= dim[1] || i2 >= dim[0]) throw new SubscriptOutOfRange();
return array[i1 * dim[0] + i2]; return array[i1 * dim[0] + i2];
} }
ref T opIndex(int i1, int i2, int i3) ref T opIndex(int i1, int i2, int i3)
{ {
if(dimCount != 3) throw new SyntaxError(); if(dimCount != 3) throw new SyntaxError();
if(i1 >= dim[0] && i2 >= dim[1] && i3 >= dim[2]) throw new SubscriptOutOfRange(); if(i1 >= dim[2] || i2 >= dim[1] || i3 >= dim[0]) throw new SubscriptOutOfRange();
return array[i1 * dim[0] * dim[1] + i2 * dim[0] + i3]; return array[i1 * dim[0] * dim[1] + i2 * dim[0] + i3];
} }
ref T opIndex(int i1, int i2, int i3, int i4) ref T opIndex(int i1, int i2, int i3, int i4)
{ {
if(dimCount != 4) throw new SyntaxError(); if(dimCount != 4) throw new SyntaxError();
if(i1 >= dim[0] && i2 >= dim[1] && i3 >= dim[2] && i4 >= dim[3]) throw new SubscriptOutOfRange(); if(i1 >= dim[3] || i2 >= dim[2] || i3 >= dim[1] || i4 >= dim[0]) throw new SubscriptOutOfRange();
return array[i1];//array[i1 * dim[0] * dim[1] * dim[2] + i2 * dim[1] + i3]; return array[i1];//array[i1 * dim[0] * dim[1] * dim[2] + i2 * dim[1] + i3];
} }
T opIndexAssign(T v, int i1) T opIndexAssign(T v, int i1)
@@ -364,19 +364,19 @@ class Array(T)
T opIndexAssign(T v, int i1, int i2) T opIndexAssign(T v, int i1, int i2)
{ {
if(dimCount != 2) throw new SyntaxError(); if(dimCount != 2) throw new SyntaxError();
if(i1 >= dim[0] && i2 >= dim[1]) throw new SubscriptOutOfRange(); if(i1 >= dim[1] || i2 >= dim[0]) throw new SubscriptOutOfRange();
return array[i1 * dim[0] + i2] = v; return array[i1 * dim[0] + i2] = v;
} }
T opIndexAssign(T v, int i1, int i2, int i3) T opIndexAssign(T v, int i1, int i2, int i3)
{ {
if(dimCount != 3) throw new SyntaxError(); if(dimCount != 3) throw new SyntaxError();
if(i1 >= dim[0] && i2 >= dim[1] && i3 >= dim[2]) throw new SubscriptOutOfRange(); if(i1 >= dim[2] || i2 >= dim[1] || i3 >= dim[0]) throw new SubscriptOutOfRange();
return array[i1 * dim[0] * dim[1] + i2 * dim[0] + i3] = v; return array[i1 * dim[0] * dim[1] + i2 * dim[0] + i3] = v;
} }
T opIndexAssign(T v, int i1, int i2, int i3, int i4) T opIndexAssign(T v, int i1, int i2, int i3, int i4)
{ {
if(dimCount != 4) throw new SyntaxError(); if(dimCount != 4) throw new SyntaxError();
if(i1 >= dim[0] && i2 >= dim[1] && i3 >= dim[2] && i4 >= dim[3]) throw new SubscriptOutOfRange(); if(i1 >= dim[3] || i2 >= dim[2] || i3 >= dim[1] || i4 >= dim[0]) throw new SubscriptOutOfRange();
return array[i1] = v;//array[i1 * dim[0] * dim[1] * dim[2] + i2 * dim[1] + i3] = v; return array[i1] = v;//array[i1 * dim[0] * dim[1] * dim[2] + i2 * dim[1] + i3] = v;
} }
void push(T v) void push(T v)