From: Bruce Momjian <bruce@momjian.us>
Date: Sun, 3 Sep 2006 01:22:56 +0000 (+0000)
Subject: Fix case where "PM" to_timestamp() mask was eating too many characters.
X-Git-Tag: REL8_2_BETA1~185
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1d4abf21751496d35d096cfdbcc2ba986e9b5e7c;p=postgresql

Fix case where "PM" to_timestamp() mask was eating too many characters.
Report from Josh Tolley.
---

diff --git a/src/backend/utils/adt/formatting.c b/src/backend/utils/adt/formatting.c
index 3431a063cc..1a711090bd 100644
--- a/src/backend/utils/adt/formatting.c
+++ b/src/backend/utils/adt/formatting.c
@@ -1,7 +1,7 @@
 /* -----------------------------------------------------------------------
  * formatting.c
  *
- * $PostgreSQL: pgsql/src/backend/utils/adt/formatting.c,v 1.110 2006/04/19 18:49:09 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/adt/formatting.c,v 1.111 2006/09/03 01:22:56 momjian Exp $
  *
  *
  *	 Portions Copyright (c) 1999-2006, PostgreSQL Global Development Group
@@ -1762,7 +1762,7 @@ dch_time(int arg, char *inout, int suf, bool is_to_char, bool is_interval,
 					tmfc->am = TRUE;
 				else
 					AMPM_ERROR;
-				return strlen(p_inout);
+				return strlen(P_M_STR);
 			}
 			break;
 		case DCH_AM:
@@ -1781,7 +1781,7 @@ dch_time(int arg, char *inout, int suf, bool is_to_char, bool is_interval,
 					tmfc->am = TRUE;
 				else
 					AMPM_ERROR;
-				return strlen(p_inout);
+				return strlen(PM_STR);
 			}
 			break;
 		case DCH_a_m:
@@ -1800,7 +1800,7 @@ dch_time(int arg, char *inout, int suf, bool is_to_char, bool is_interval,
 					tmfc->am = TRUE;
 				else
 					AMPM_ERROR;
-				return strlen(p_inout);
+				return strlen(p_m_STR);
 			}
 			break;
 		case DCH_am:
@@ -1819,7 +1819,7 @@ dch_time(int arg, char *inout, int suf, bool is_to_char, bool is_interval,
 					tmfc->am = TRUE;
 				else
 					AMPM_ERROR;
-				return strlen(p_inout);
+				return strlen(pm_STR);
 			}
 			break;
 		case DCH_HH: