Added result checks for calls to gmtime().

diff --git a/src/interfaces/ecpg/pgtypeslib/datetime.c b/src/interfaces/ecpg/pgtypeslib/datetime.c
index d158a5c72fea2ab891b17bff8e8e91300b6d94be..7bf8553defd75e9d7bf3d175031bc084e2bf1f3a 100644 (file)
--- a/src/interfaces/ecpg/pgtypeslib/datetime.c
+++ b/src/interfaces/ecpg/pgtypeslib/datetime.c
@@ -87,7 +87,11 @@ PGTYPESdate_from_asc(char *str, char **endptr)
                        break;
 
                case DTK_EPOCH:
-                       GetEpochTime(tm);
+                       if (GetEpochTime(tm) < 0)
+                       {
+                               errno = PGTYPES_DATE_BAD_DATE;
+                               return INT_MIN;
+                       }
                        break;
 
                default:
@@ -153,7 +157,8 @@ PGTYPESdate_today(date * d)
        struct tm       ts;
 
        GetCurrentDateTime(&ts);
-       *d = date2j(ts.tm_year, ts.tm_mon, ts.tm_mday) - date2j(2000, 1, 1);
+       if (errno == 0)
+               *d = date2j(ts.tm_year, ts.tm_mon, ts.tm_mday) - date2j(2000, 1, 1);
        return;
 }
 

diff --git a/src/interfaces/ecpg/pgtypeslib/dt.h b/src/interfaces/ecpg/pgtypeslib/dt.h
index 82d1a4b12137c0d928a321e03072b97ca9959c5e..4cd710823a7384c8b75d220f7d73823e8d592710 100644 (file)
--- a/src/interfaces/ecpg/pgtypeslib/dt.h
+++ b/src/interfaces/ecpg/pgtypeslib/dt.h
@@ -342,7 +342,7 @@ int                 tm2timestamp(struct tm *, fsec_t, int *, timestamp *);
 int                    DecodeUnits(int field, char *lowtoken, int *val);
 bool           CheckDateTokenTables(void);
 int                    EncodeDateOnly(struct tm *, int, char *, bool);
-void           GetEpochTime(struct tm *);
+int            GetEpochTime(struct tm *);
 int                    ParseDateTime(char *, char *, char **, int *, int, int *, char **);
 int                    DecodeDateTime(char **, int *, int, int *, struct tm *, fsec_t *, bool);
 void           j2date(int, int *, int *, int *);

diff --git a/src/interfaces/ecpg/pgtypeslib/dt_common.c b/src/interfaces/ecpg/pgtypeslib/dt_common.c
index afce8f3f60a756c1660956569e3c0f1d577c8e80..349aa7982edf81f31beb779a5929d8e3eba70048 100644 (file)
--- a/src/interfaces/ecpg/pgtypeslib/dt_common.c
+++ b/src/interfaces/ecpg/pgtypeslib/dt_common.c
@@ -982,7 +982,7 @@ EncodeDateTime(struct tm * tm, fsec_t fsec, int *tzp, char **tzn, int style, cha
        return TRUE;
 }      /* EncodeDateTime() */
 
-void
+int
 GetEpochTime(struct tm * tm)
 {
        struct tm  *t0;
@@ -990,14 +990,19 @@ GetEpochTime(struct tm * tm)
 
        t0 = gmtime(&epoch);
 
-       tm->tm_year = t0->tm_year + 1900;
-       tm->tm_mon = t0->tm_mon + 1;
-       tm->tm_mday = t0->tm_mday;
-       tm->tm_hour = t0->tm_hour;
-       tm->tm_min = t0->tm_min;
-       tm->tm_sec = t0->tm_sec;
+       if (t0)
+       {
+               tm->tm_year = t0->tm_year + 1900;
+               tm->tm_mon = t0->tm_mon + 1;
+               tm->tm_mday = t0->tm_mday;
+               tm->tm_hour = t0->tm_hour;
+               tm->tm_min = t0->tm_min;
+               tm->tm_sec = t0->tm_sec;
+
+               return 0;
+       }
 
-       return;
+       return -1;
 }      /* GetEpochTime() */
 
 static void
@@ -1006,11 +1011,18 @@ abstime2tm(AbsoluteTime _time, int *tzp, struct tm * tm, char **tzn)
        time_t          time = (time_t) _time;
        struct tm  *tx;
 
+       errno = 0;
        if (tzp != NULL)
                tx = localtime((time_t *) &time);
        else
                tx = gmtime((time_t *) &time);
 
+       if (!tx)
+       {
+               errno = PGTYPES_TS_BAD_TIMESTAMP;
+               return;
+       }
+
        tm->tm_year = tx->tm_year + 1900;
        tm->tm_mon = tx->tm_mon + 1;
        tm->tm_mday = tx->tm_mday;
@@ -2852,12 +2864,18 @@ PGTYPEStimestamp_defmt_scan(char **str, char *fmt, timestamp * d,
                                        time_t          et = (time_t) scan_val.luint_val;
 
                                        tms = gmtime(&et);
-                                       *year = tms->tm_year + 1900;
-                                       *month = tms->tm_mon + 1;
-                                       *day = tms->tm_mday;
-                                       *hour = tms->tm_hour;
-                                       *minute = tms->tm_min;
-                                       *second = tms->tm_sec;
+
+                                       if (tms)
+                                       {
+                                               *year = tms->tm_year + 1900;
+                                               *month = tms->tm_mon + 1;
+                                               *day = tms->tm_mday;
+                                               *hour = tms->tm_hour;
+                                               *minute = tms->tm_min;
+                                               *second = tms->tm_sec;
+                                       }
+                                       else
+                                               err = 1;
                                }
                                break;
                        case 'S':

diff --git a/src/interfaces/ecpg/pgtypeslib/timestamp.c b/src/interfaces/ecpg/pgtypeslib/timestamp.c
index e9fa5d5a621210a42ee0ee3b57db90ae00d52b31..8871b0f40867ff95b7085bfb8e51d72a796b1d12 100644 (file)
--- a/src/interfaces/ecpg/pgtypeslib/timestamp.c
+++ b/src/interfaces/ecpg/pgtypeslib/timestamp.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL:$ 
+ * $PostgreSQL$ 
  */
 #include "postgres_fe.h"
 
@@ -91,11 +91,18 @@ tm2timestamp(struct tm * tm, fsec_t fsec, int *tzp, timestamp * result)
 static timestamp
 SetEpochTimestamp(void)
 {
+#ifdef HAVE_INT64_TIMESTAMP
+       int64           noresult = 0;
+#else
+       double          noresult = 0.0;
+#endif
        timestamp       dt;
        struct tm       tt,
                           *tm = &tt;
 
-       GetEpochTime(tm);
+       if (GetEpochTime(tm) < 0)
+               return noresult;
+
        tm2timestamp(tm, 0, NULL, &dt);
        return dt;
 }      /* SetEpochTimestamp() */
@@ -372,7 +379,8 @@ PGTYPEStimestamp_current(timestamp * ts)
        struct tm       tm;
 
        GetCurrentDateTime(&tm);
-       tm2timestamp(&tm, 0, NULL, ts);
+       if (errno == 0)
+               tm2timestamp(&tm, 0, NULL, ts);
        return;
 }