diff --git a/src/backend/utils/adt/arrayfuncs.c b/src/backend/utils/adt/arrayfuncs.c
index acb4e8f48a2df3ca8673aeab22f87197c4c76b5b..7c09276d86a84ab16dcb534d1787734629dd6813 100644
--- a/src/backend/utils/adt/arrayfuncs.c
+++ b/src/backend/utils/adt/arrayfuncs.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.52 2000/01/26 05:57:12 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.52.2.1 2000/05/28 17:43:34 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1309,6 +1309,10 @@ array_map(ArrayType *v,
 	char	   *p;
 	va_list		ap;
 
+	/* Need to guard against NULL input array */
+	if (v == NULL)
+		return NULL;
+
 	/* Large objects not yet supported */
 	if (ARR_IS_LO(v) == true)
 		elog(ERROR, "array_map: large objects not supported");