shithub: scc

Info  •  Files  •  Log  •  Branches

[as] Add address overflow check

--- a/as/as.h

+++ b/as/as.h

@@ -55,3 +55,4 @@

 extern Ins instab[];

 extern Op optab[];

 extern int pass;

+extern TUINT maxaddr;

--- a/as/main.c

+++ b/as/main.c

@@ -50,6 +50,7 @@

 	Ins *ins;

 	Op *op, *lim;

 	Arg *args;

+	TUINT pc, curpc;

 	ins = bsearch(text, instab, nr_ins, sizeof(Ins), cmp);

@@ -69,10 +70,25 @@

 		return;

 	}

 	(*op->format)(op, args);

+

+	pc = cursec->pc;

+	curpc = cursec->curpc;

+

 	cursec->curpc += op->size;

 	cursec->pc += op->size;

+

+	if (pass == 2)

+		return;

+

 	if (cursec->pc > cursec->max)

 		cursec->max = cursec->pc;

+

+	if (pc > cursec->pc ||

+	    curpc > cursec->curpc ||

+	    cursec->curpc > maxaddr ||

+	    cursec->pc > maxaddr) {

+		die("address overflow");

+	}

 }

 int

--- a/as/target/i386/ins.c

+++ b/as/target/i386/ins.c

@@ -3,6 +3,8 @@

 #include "../../as.h"

 #include "ins.h"

+TUINT maxaddr = ((TUINT) 1 << 32) -1;

+

 void

 direct(Op *op, Arg *args)

 {