Index: src/backend/utils/error/elog.c
===================================================================
RCS file: /projects/cvsroot/pgsql-server/src/backend/utils/error/elog.c,v
retrieving revision 1.128
diff -c -r1.128 elog.c
*** src/backend/utils/error/elog.c	15 Mar 2004 15:56:23 -0000	1.128
--- src/backend/utils/error/elog.c	18 Mar 2004 22:55:44 -0000
***************
*** 1035,1041 ****
--- 1035,1045 ----
  	int result_len = 2*NAMEDATALEN + format_len +120 ;
  
  	if (result == NULL)
+ 	{
  		result = malloc(result_len);
+ 		if (result == NULL)
+ 			return "";
+ 	}
  	result[0] = '\0';
  
  	if (format_len > 0)
***************
*** 1119,1126 ****
  							 localtime(&stamp_time));
  					break;
  				case 's':
  					j += strftime(result+j, result_len-j, "%Y-%m-%d %H:%M:%S",
! 							 localtime(&(MyProcPort->session_start.tv_sec)));
  					break;
  				case 'i':
  					j += snprintf(result+j,result_len-j,"%s",
--- 1123,1131 ----
  							 localtime(&stamp_time));
  					break;
  				case 's':
+ 					stamp_time = (time_t)(MyProcPort->session_start.tv_sec);
  					j += strftime(result+j, result_len-j, "%Y-%m-%d %H:%M:%S",
! 							 localtime(&stamp_time));
  					break;
  				case 'i':
  					j += snprintf(result+j,result_len-j,"%s",