From 85c17dbff8ade0c5237e3ac1ece7cacacfdde399 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Tue, 6 Feb 2001 01:53:53 +0000
Subject: Out-of-bounds memory allocation request sizes should be treated as
 just elog(ERROR) not an Assert trap, since we've downgraded out-of-memory to
 elog(ERROR) not a fatal error.  Also, change the hard boundary from 256Mb to
 1Gb, just so that anyone who's actually got that much memory to spare can
 play with TOAST objects approaching a gigabyte.

---
 src/backend/utils/error/excid.c | 14 +-------------
 src/backend/utils/mmgr/mcxt.c   | 12 +++++++-----
 2 files changed, 8 insertions(+), 18 deletions(-)

(limited to 'src/backend')

diff --git a/src/backend/utils/error/excid.c b/src/backend/utils/error/excid.c
index bef1c00856b..877610176a3 100644
--- a/src/backend/utils/error/excid.c
+++ b/src/backend/utils/error/excid.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/excid.c,v 1.9 2001/01/24 19:43:15 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/excid.c,v 1.10 2001/02/06 01:53:53 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -42,18 +42,6 @@ Exception	BadArg = {"Bad Argument to Function Call"};
  *	 Specific Recoverable Exceptions										 *
  *****************************************************************************/
 
-/*
- * BadAllocSize
- *		Indicates that an allocation request is of unreasonable size.
- */
-Exception	BadAllocSize = {"Too Large Allocation Request"};
-
-/*
- * ExhaustedMemory
- *		Indicates an dynamic memory allocation failed.
- */
-Exception	ExhaustedMemory = {"Memory Allocation Failed"};
-
 /*
  * Unimplemented
  *		Indicates a function call request requires unimplemented code.
diff --git a/src/backend/utils/mmgr/mcxt.c b/src/backend/utils/mmgr/mcxt.c
index 0520cb6d0a6..ab8434a0581 100644
--- a/src/backend/utils/mmgr/mcxt.c
+++ b/src/backend/utils/mmgr/mcxt.c
@@ -14,7 +14,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/mmgr/mcxt.c,v 1.26 2001/01/24 19:43:16 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/mmgr/mcxt.c,v 1.27 2001/02/06 01:53:53 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -417,8 +417,9 @@ MemoryContextAlloc(MemoryContext context, Size size)
 {
 	AssertArg(MemoryContextIsValid(context));
 
-	LogTrap(!AllocSizeIsValid(size), BadAllocSize,
-			("size=%d [0x%x]", size, size));
+	if (!AllocSizeIsValid(size))
+		elog(ERROR, "MemoryContextAlloc: invalid request size %lu",
+			 (unsigned long) size);
 
 	return (*context->methods->alloc) (context, size);
 }
@@ -474,8 +475,9 @@ repalloc(void *pointer, Size size)
 
 	AssertArg(MemoryContextIsValid(header->context));
 
-	LogTrap(!AllocSizeIsValid(size), BadAllocSize,
-			("size=%d [0x%x]", size, size));
+	if (!AllocSizeIsValid(size))
+		elog(ERROR, "repalloc: invalid request size %lu",
+			 (unsigned long) size);
 
     return (*header->context->methods->realloc) (header->context,
 												 pointer, size);
-- 
cgit v1.2.3