summaryrefslogtreecommitdiff
path: root/src/include
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2000-05-29 19:16:57 +0000
committerTom Lane <tgl@sss.pgh.pa.us>2000-05-29 19:16:57 +0000
commit22a517a40c29ec421db8ebd8b1eb17e50b76b406 (patch)
tree10b00ec5ab4eaa84efe85e0072711b80d0414b1a /src/include
parentf089c36419adcfc23b3a83560dc67633b1e7b939 (diff)
downloadpostgresql-22a517a40c29ec421db8ebd8b1eb17e50b76b406.tar.gz
Repair problems with overrun of timezone name length. Increase MAXTZLEN
to 10, and be consistent about whether it counts the trailing null (it does not). Also increase MAXDATELEN to be sure no buffer overflows are caused by the longer MAXTZLEN.
Diffstat (limited to 'src/include')
-rw-r--r--src/include/miscadmin.h4
-rw-r--r--src/include/utils/datetime.h6
2 files changed, 5 insertions, 5 deletions
diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h
index 5070f5bc4d..62f34da5d3 100644
--- a/src/include/miscadmin.h
+++ b/src/include/miscadmin.h
@@ -12,7 +12,7 @@
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $Id: miscadmin.h,v 1.55 2000/04/12 17:16:24 momjian Exp $
+ * $Id: miscadmin.h,v 1.56 2000/05/29 19:16:55 tgl Exp $
*
* NOTES
* some of the information in this file will be moved to
@@ -85,7 +85,7 @@ extern int DebugLvl;
* CTZName is the timezone label.
*/
-#define MAXTZLEN 7
+#define MAXTZLEN 10 /* max TZ name len, not counting tr. null */
#define USE_POSTGRES_DATES 0
#define USE_ISO_DATES 1
diff --git a/src/include/utils/datetime.h b/src/include/utils/datetime.h
index d1dce4e81d..2e8ca5bc9b 100644
--- a/src/include/utils/datetime.h
+++ b/src/include/utils/datetime.h
@@ -9,7 +9,7 @@
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $Id: datetime.h,v 1.13 2000/04/14 15:22:22 thomas Exp $
+ * $Id: datetime.h,v 1.14 2000/05/29 19:16:56 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -163,8 +163,8 @@
#define DTK_DATE_M (DTK_M(YEAR) | DTK_M(MONTH) | DTK_M(DAY))
#define DTK_TIME_M (DTK_M(HOUR) | DTK_M(MINUTE) | DTK_M(SECOND))
-#define MAXDATELEN 47 /* maximum possible length of an input
- * date string */
+#define MAXDATELEN 51 /* maximum possible length of an input
+ * date string (not counting tr. null) */
#define MAXDATEFIELDS 25 /* maximum possible number of fields in a
* date string */
#define TOKMAXLEN 10 /* only this many chars are stored in