* eoutofmemory and einvalidpointer fix

rtl/beos/sysutils.pp

@@ -254,12 +254,14 @@ Initialization
   InitExceptions;       { Initialize exceptions. OS independent }
   InitInternational;    { Initialize internationalization settings }
 Finalization
-  OutOfMemory.Free;
+  DoneExceptions;
-  InValidPointer.Free;
 end.
 {
   $Log$
-  Revision 1.1  2001-06-02 19:26:03  peter
+  Revision 1.2  2001-06-03 15:18:01  peter
+    * eoutofmemory and einvalidpointer fix
+
+  Revision 1.1  2001/06/02 19:26:03  peter
     * BeOS target!
 
 }

rtl/go32v2/sysutils.pp

@@ -645,12 +645,14 @@ Initialization
   InitExceptions;       { Initialize exceptions. OS independent }
   InitInternational;    { Initialize internationalization settings }
 Finalization
-  OutOfMemory.Free;
+  DoneExceptions;
-  InValidPointer.Free;
 end.
 {
   $Log$
-  Revision 1.4  2001-02-20 22:14:19  peter
+  Revision 1.5  2001-06-03 15:18:01  peter
+    * eoutofmemory and einvalidpointer fix
+
+  Revision 1.4  2001/02/20 22:14:19  peter
     * merged getenvironmentvariable
 
   Revision 1.3  2000/08/30 06:29:19  michael

rtl/netware/sysutils.pp

@@ -475,13 +475,15 @@ Initialization
   InitExceptions;       { Initialize exceptions. OS independent }
   InitInternational;    { Initialize internationalization settings }
 Finalization
-  OutOfMemory.Free;
+  DoneExceptions;
-  InValidPointer.Free;
 end.
 {
 
   $Log$
-  Revision 1.3  2001-04-16 18:39:50  florian
+  Revision 1.4  2001-06-03 15:18:01  peter
+    * eoutofmemory and einvalidpointer fix
+
+  Revision 1.3  2001/04/16 18:39:50  florian
     * updates from Armin commited
 
   Revision 1.2  2001/04/11 14:17:00  florian

rtl/objpas/sysutilh.inc

@@ -87,12 +87,17 @@ type
      public
      ErrorCode : Longint;
      end;
-   EInvalidPointer  = Class(Exception);
+   EHeapMemoryError = class(Exception)
-   EOutOfMemory     = Class(Exception);
+     protected
+     AllowFree : boolean;
+     procedure FreeInstance;override;
+     end;
+
+   EInvalidPointer  = Class(EHeapMemoryError);
+   EOutOfMemory     = Class(EHeapMemoryError);
    EAccessViolation = Class(Exception);
    EInvalidCast = Class(Exception);
 
-
    { String conversion errors }
    EConvertError = class(Exception);
 
@@ -142,7 +147,10 @@ Type
 
 {
   $Log$
-  Revision 1.8  2001-02-20 22:14:19  peter
+  Revision 1.9  2001-06-03 15:18:01  peter
+    * eoutofmemory and einvalidpointer fix
+
+  Revision 1.8  2001/02/20 22:14:19  peter
     * merged getenvironmentvariable
 
   Revision 1.7  2001/01/18 22:09:09  michael

rtl/objpas/sysutils.inc

@@ -108,6 +108,12 @@
     end;
 
 
+    procedure EHeapMemoryError.FreeInstance;
+    begin
+       if AllowFree then
+        inherited FreeInstance;
+    end;
+
 
 {$ifopt S+}
 {$define STACKCHECK_WAS_ON}
@@ -210,12 +216,24 @@ begin
   ExceptProc:=@CatchUnhandledException;
   // Create objects that may have problems when there is no memory.
   OutOfMemory:=EOutOfMemory.Create(SOutOfMemory);
+  OutOfMemory.AllowFree:=false;
   InvalidPointer:=EInvalidPointer.Create(SInvalidPointer);
+  InvalidPointer.AllowFree:=false;
   AssertErrorProc:=@AssertErrorHandler;
   ErrorProc:=@RunErrorToExcept;
   OnShowException:=Nil;
 end;
 
+
+Procedure DoneExceptions;
+begin
+  OutOfMemory.AllowFree:=true;
+  OutOfMemory.Free;
+  InValidPointer.AllowFree:=true;
+  InValidPointer.Free;
+end;
+
+
 { Exception handling routines }
 
 function ExceptObject: TObject;
@@ -290,7 +308,10 @@ end;
 
 {
   $Log$
-  Revision 1.3  2000-11-23 11:04:26  sg
+  Revision 1.4  2001-06-03 15:18:01  peter
+    * eoutofmemory and einvalidpointer fix
+
+  Revision 1.3  2000/11/23 11:04:26  sg
   * Protected some Move()'s by 'if' clauses so that the Move won't be
     executed when the length would be 0. Otherwise, the corresponding
     routines might get an RTE when compiled with $R+.

rtl/os2/sysutils.pp

@@ -769,13 +769,15 @@ Initialization
   InitExceptions;       { Initialize exceptions. OS independent }
   InitInternational;    { Initialize internationalization settings }
 Finalization
-  OutOfMemory.Free;
+  DoneExceptions;
-  InValidPointer.Free;
 end.
 
 {
   $Log$
-  Revision 1.11  2001-05-21 20:50:19  hajny
+  Revision 1.12  2001-06-03 15:18:01  peter
+    * eoutofmemory and einvalidpointer fix
+
+  Revision 1.11  2001/05/21 20:50:19  hajny
     * silly mistyping corrected
 
   Revision 1.10  2001/05/20 18:40:33  hajny

rtl/unix/sysutils.pp

@@ -460,13 +460,15 @@ Initialization
   InitExceptions;       { Initialize exceptions. OS independent }
   InitInternational;    { Initialize internationalization settings }
 Finalization
-  OutOfMemory.Free;
+  DoneExceptions;
-  InValidPointer.Free;
 end.
 {
 
   $Log$
-  Revision 1.8  2001-02-20 22:19:38  peter
+  Revision 1.9  2001-06-03 15:18:01  peter
+    * eoutofmemory and einvalidpointer fix
+
+  Revision 1.8  2001/02/20 22:19:38  peter
     * always test before commiting after merging, linux -> unix change
 
   Revision 1.7  2001/02/20 22:14:19  peter

rtl/win32/sysutils.pp

@@ -673,14 +673,16 @@ Initialization
     end;
 
 Finalization
-  OutOfMemory.Free;
+  DoneExceptions;
-  InValidPointer.Free;
   if kernel32dll<>0 then
    FreeLibrary(kernel32dll);
 end.
 {
   $Log$
-  Revision 1.8  2001-05-20 12:08:36  peter
+  Revision 1.9  2001-06-03 15:18:01  peter
+    * eoutofmemory and einvalidpointer fix
+
+  Revision 1.8  2001/05/20 12:08:36  peter
     * fixed filesearch
 
   Revision 1.7  2001/04/16 10:57:05  peter