Skip to content

Commit 1d4abf2

Browse files
committed
Fix case where "PM" to_timestamp() mask was eating too many characters.
Report from Josh Tolley.
1 parent 754c7d5 commit 1d4abf2

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/backend/utils/adt/formatting.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* -----------------------------------------------------------------------
22
* formatting.c
33
*
4-
* $PostgreSQL: pgsql/src/backend/utils/adt/formatting.c,v 1.110 2006/04/19 18:49:09 momjian Exp $
4+
* $PostgreSQL: pgsql/src/backend/utils/adt/formatting.c,v 1.111 2006/09/03 01:22:56 momjian Exp $
55
*
66
*
77
* 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,
17621762
tmfc->am = TRUE;
17631763
else
17641764
AMPM_ERROR;
1765-
return strlen(p_inout);
1765+
return strlen(P_M_STR);
17661766
}
17671767
break;
17681768
case DCH_AM:
@@ -1781,7 +1781,7 @@ dch_time(int arg, char *inout, int suf, bool is_to_char, bool is_interval,
17811781
tmfc->am = TRUE;
17821782
else
17831783
AMPM_ERROR;
1784-
return strlen(p_inout);
1784+
return strlen(PM_STR);
17851785
}
17861786
break;
17871787
case DCH_a_m:
@@ -1800,7 +1800,7 @@ dch_time(int arg, char *inout, int suf, bool is_to_char, bool is_interval,
18001800
tmfc->am = TRUE;
18011801
else
18021802
AMPM_ERROR;
1803-
return strlen(p_inout);
1803+
return strlen(p_m_STR);
18041804
}
18051805
break;
18061806
case DCH_am:
@@ -1819,7 +1819,7 @@ dch_time(int arg, char *inout, int suf, bool is_to_char, bool is_interval,
18191819
tmfc->am = TRUE;
18201820
else
18211821
AMPM_ERROR;
1822-
return strlen(p_inout);
1822+
return strlen(pm_STR);
18231823
}
18241824
break;
18251825
case DCH_HH:

0 commit comments

Comments
 (0)