Merged revisions 6811 via svnmerge from

http://svn.freepascal.org/svn/fpc/trunk

........
  r6811 | pierre | 2007-03-12 21:59:36 +0100 (Mon, 12 Mar 2007) | 1 line
  
   * return nil in TraceGetMem if SysGetMem returns nil
........

git-svn-id: branches/fixes_2_2@6944 -

rtl/inc/heaptrc.pp

@@ -371,7 +371,14 @@ begin
 {$endif cpuarm}
   if add_tail then
     inc(allocsize,sizeof(ptrint));
+  { if ReturnNilIfGrowHeapFails is true
+    SysGetMem can return nil }
   p:=SysGetMem(allocsize);
+  if (p=nil) then
+    begin
+      TraceGetMem:=nil;
+      exit;
+    end;
   pp:=pheap_mem_info(p);
   inc(p,sizeof(theap_mem_info));
 { Create the info block }