diff --git a/src/sys/include/ubixos/init.h b/src/sys/include/ubixos/init.h index 6c99590..96781ac 100644 --- a/src/sys/include/ubixos/init.h +++ b/src/sys/include/ubixos/init.h @@ -62,7 +62,6 @@ devfs_init, ubixfs_init, fdc_init, - 0x0, }; int init_tasksTotal = sizeof(init_tasks)/sizeof(intFunctionPTR); @@ -71,6 +70,9 @@ /*** $Log$ + Revision 1.17 2004/07/17 02:45:55 reddawg + Modified assert it now invokes kPanic it is very nifty + Revision 1.16 2004/07/17 02:38:31 reddawg Fixed a few problems diff --git a/src/sys/kernel/exec.c b/src/sys/kernel/exec.c index a3643d5..0fb9da9 100644 --- a/src/sys/kernel/exec.c +++ b/src/sys/kernel/exec.c @@ -35,6 +35,7 @@ #include #include #include +#include /***************************************************************************************** @@ -51,6 +52,7 @@ kTask_t * newProcess; /* Find A New Thread */ newProcess = schedNewTask(); + assert(newProcess); /* Set All The Correct Thread Attributes */ newProcess->tss.back_link = 0x0; @@ -134,6 +136,7 @@ /* Get A New Task For This Proccess */ _current = schedNewTask(); + assert(_current); _current->gid = 0; _current->uid = 0; @@ -357,6 +360,7 @@ /* Load ELF Header */ binaryHeader = (elfHeader *)kmalloc(sizeof(elfHeader)); + assert(binaryHeader); fread(binaryHeader,sizeof(elfHeader),1,tmpFd); /* Set sectionHeader To Point To Loaded Binary To We Can Gather Info */ @@ -382,10 +386,12 @@ /* Load The Program Header(s) */ programHeader = (elfProgramHeader *)kmalloc(sizeof(elfProgramHeader)*binaryHeader->ePhnum); + assert(programHeader); fseek(tmpFd,binaryHeader->ePhoff,0); fread(programHeader,(sizeof(elfProgramHeader)*binaryHeader->ePhnum),1,tmpFd); sectionHeader = (elfSectionHeader *)kmalloc(sizeof(elfSectionHeader)*binaryHeader->eShnum); + assert(sectionHeader); fseek(tmpFd,binaryHeader->eShoff,0); fread(sectionHeader,sizeof(elfSectionHeader)*binaryHeader->eShnum,1,tmpFd); @@ -445,6 +451,9 @@ /*** $Log$ + Revision 1.40 2004/06/28 23:12:58 reddawg + file format now container:/path/to/file + Revision 1.39 2004/06/18 15:29:38 reddawg zero out memory diff --git a/src/sys/kernel/fork.c b/src/sys/kernel/fork.c index dc1ba4a..a2c2630 100644 --- a/src/sys/kernel/fork.c +++ b/src/sys/kernel/fork.c @@ -31,6 +31,7 @@ #include #include #include +#include /************************************************************************ @@ -62,6 +63,7 @@ ); int forkCopyProcess(struct taskStruct *newProcess,long ebp,long edi,long esi,long none,long ebx,long ecx,long edx,long eip,long cs,long eflags,long esp,long ss) { + assert(newProcess); /* Set Up New Tasks Information */ newProcess->uid = _current->uid; @@ -104,6 +106,9 @@ /*** $Log$ + Revision 1.6 2004/06/26 01:24:44 reddawg + Fixens + Revision 1.5 2004/06/15 12:24:07 reddawg Cleaned Up diff --git a/src/sys/kernel/ld.c b/src/sys/kernel/ld.c index d035dbc..81d2f0c 100644 --- a/src/sys/kernel/ld.c +++ b/src/sys/kernel/ld.c @@ -36,6 +36,7 @@ #include #include #include +#include uInt32 ldEnable() { int i = 0x0; @@ -61,13 +62,16 @@ fseek(ldFd,0x0,0x0); binaryHeader = (elfHeader *)kmalloc(sizeof(elfHeader)); + assert(binaryHeader); fread(binaryHeader,sizeof(elfHeader),1,ldFd); programHeader = (elfProgramHeader *)kmalloc(sizeof(elfProgramHeader)*binaryHeader->ePhnum); + assert(programHeader); fseek(ldFd,binaryHeader->ePhoff,0); fread(programHeader,sizeof(elfSectionHeader),binaryHeader->ePhnum,ldFd); sectionHeader = (elfSectionHeader *)kmalloc(sizeof(elfSectionHeader)*binaryHeader->eShnum); + assert(sectionHeader); fseek(ldFd,binaryHeader->eShoff,0); fread(sectionHeader,sizeof(elfSectionHeader),binaryHeader->eShnum,ldFd); @@ -157,6 +161,9 @@ /*** $Log$ + Revision 1.27 2004/06/28 23:12:58 reddawg + file format now container:/path/to/file + Revision 1.26 2004/06/18 15:18:05 reddawg bug fixes: did some double checking on pointers and 0x0 out memory