diff options
| author | Stefan Metzmacher <metze@samba.org> | 2015-01-19 15:47:58 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2015-01-24 17:49:05 +0100 |
| commit | d1b515535da46591d3a646a848c7427b6ff951a7 (patch) | |
| tree | 3961ce1777aa483c3ddb24c29db0830a34c39dbf /lib/ldb | |
| parent | 6a56bdf9869162e57c816c067598552bd33c2910 (diff) | |
| download | samba-d1b515535da46591d3a646a848c7427b6ff951a7.tar.gz | |
lib/ldb: fix logic in ldb_val_to_time()
040408072012Z should represent 20040408072012.0Z
as well as 20040408072012.000Z or
20040408072012.RandomIgnoredCharaters...Z
Bug: https://bugzilla.samba.org/show_bug.cgi?id=9810
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Günther Deschner <gd@samba.org>
Diffstat (limited to 'lib/ldb')
| -rw-r--r-- | lib/ldb/common/ldb_msg.c | 38 |
1 files changed, 32 insertions, 6 deletions
diff --git a/lib/ldb/common/ldb_msg.c b/lib/ldb/common/ldb_msg.c index 809e3af8193..3f65351ff29 100644 --- a/lib/ldb/common/ldb_msg.c +++ b/lib/ldb/common/ldb_msg.c @@ -1090,28 +1090,54 @@ time_t ldb_string_to_time(const char *s) */ int ldb_val_to_time(const struct ldb_val *v, time_t *t) { - struct tm tm; + char val[15] = {}; + struct tm tm = {}; - if (v == NULL || !v->data || (v->length != 17 && v->length != 13)) { + if (v == NULL) { return LDB_ERR_INVALID_ATTRIBUTE_SYNTAX; } - memset(&tm, 0, sizeof(tm)); + if (v->data == NULL) { + return LDB_ERR_INVALID_ATTRIBUTE_SYNTAX; + } + + if (v->length < 16 && v->length != 13) { + return LDB_ERR_INVALID_ATTRIBUTE_SYNTAX; + } + + if (v->data[v->length - 1] != 'Z') { + return LDB_ERR_INVALID_ATTRIBUTE_SYNTAX; + } if (v->length == 13) { - if (sscanf((char *)v->data, "%02u%02u%02u%02u%02u%02uZ", + memcpy(val, v->data, 12); + + if (sscanf(val, "%02u%02u%02u%02u%02u%02u", &tm.tm_year, &tm.tm_mon, &tm.tm_mday, &tm.tm_hour, &tm.tm_min, &tm.tm_sec) != 6) { return LDB_ERR_INVALID_ATTRIBUTE_SYNTAX; } + if (tm.tm_year < 50) { + tm.tm_year += 100; + } } else { - if (sscanf((char *)v->data, "%04u%02u%02u%02u%02u%02u.0Z", + + /* + * anything between '.' and 'Z' is silently ignored. + */ + if (v->data[14] != '.') { + return LDB_ERR_INVALID_ATTRIBUTE_SYNTAX; + } + + memcpy(val, v->data, 14); + + if (sscanf(val, "%04u%02u%02u%02u%02u%02u", &tm.tm_year, &tm.tm_mon, &tm.tm_mday, &tm.tm_hour, &tm.tm_min, &tm.tm_sec) != 6) { return LDB_ERR_INVALID_ATTRIBUTE_SYNTAX; } + tm.tm_year -= 1900; } - tm.tm_year -= 1900; tm.tm_mon -= 1; *t = timegm(&tm); |