X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fsyscalls.c;h=35e48902566bc1a846a134ebfb7af3d98d88334d;hb=784b6fc9ee5221ed58ed7a118c0c856d483a2ea7;hp=7de7b15d5c9fef0c4ef80f7d9333346c2af802b7;hpb=61c8b3334fb9bb3c1fb48d9f1f3508ffbe5341bf;p=tpg%2Facess2.git

diff --git a/Kernel/syscalls.c b/Kernel/syscalls.c
index 7de7b15d..35e48902 100644
--- a/Kernel/syscalls.c
+++ b/Kernel/syscalls.c
@@ -156,16 +156,18 @@ void SyscallHandler(tSyscallRegs *Regs)
 				CHECK_NUM_NONULL( &tmp[i], sizeof(char*) );
 				CHECK_STR_NONULL( tmp[i] );
 			}
+			if(ret == -1) break;
 			// Check EnvP also
 			// - EnvP can be NULL
 			if( Regs->Arg3 )
 			{
 				tmp = (char**)Regs->Arg3;
-				//Log("tmp = %p", tmp);
+				CHECK_NUM_NONULL(tmp, sizeof(char**));
 				for(i=0;tmp[i];i++) {
-					CHECK_NUM_NULLOK( &tmp[i], sizeof(char*) );
+					CHECK_NUM_NONULL( &tmp[i], sizeof(char*) );
 					CHECK_STR_NONULL( tmp[i] );
 				}
+				if(ret == -1) break;
 			}
 		}
 		LEAVE('s', "Assuming 0");
@@ -313,7 +315,7 @@ void SyscallHandler(tSyscallRegs *Regs)
 	//#if DEBUG_BUILD
 	case SYS_DEBUG:
 		CHECK_STR_NONULL( (char*)Regs->Arg1 );
-		LogF("Log: [%i] ", Threads_GetTID());
+		LogF("Log: %08lli [%i] ", now(), Threads_GetTID());
 		LogF((const char*)Regs->Arg1,
 			Regs->Arg2, Regs->Arg3, Regs->Arg4, Regs->Arg5, Regs->Arg6);
 		LogF("\r\n");