From: Thierry FOURNIER <tfournier@arpalert.org>
Date: Tue, 7 Jul 2015 22:15:20 +0000 (+0200)
Subject: BUG/MINOR: http/sample: gmtime/localtime can fail
X-Git-Tag: v1.6-dev3~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fac9ccfb705702f211f99e67d5f5d5129002086a;p=thirdparty%2Fhaproxy.git

BUG/MINOR: http/sample: gmtime/localtime can fail

The man said that gmtime() and localtime() can return a NULL value.
This is not tested. It appears that all the values of a 32 bit integer
are valid, but it is better to check the return of these functions.

However, if the integer move from 32 bits to 64 bits, some 64 values
can be unsupported.
---

diff --git a/src/proto_http.c b/src/proto_http.c
index 0ebc2c4099..69ad908def 100644
--- a/src/proto_http.c
+++ b/src/proto_http.c
@@ -12084,6 +12084,8 @@ static int sample_conv_http_date(const struct arg *args, struct sample *smp, voi
 		curr_date += args[0].data.sint;
 
 	tm = gmtime(&curr_date);
+	if (!tm)
+		return 0;
 
 	temp = get_trash_chunk();
 	temp->len = snprintf(temp->str, temp->size - temp->len,
diff --git a/src/sample.c b/src/sample.c
index 6088869b50..0a09012adc 100644
--- a/src/sample.c
+++ b/src/sample.c
@@ -1519,13 +1519,17 @@ static int sample_conv_ltime(const struct arg *args, struct sample *smp, void *p
 {
 	struct chunk *temp;
 	time_t curr_date = smp->data.uint;
+	struct tm *tm;
 
 	/* add offset */
 	if (args[1].type == ARGT_SINT || args[1].type == ARGT_UINT)
 		curr_date += args[1].data.sint;
 
+	tm = localtime(&curr_date);
+	if (!tm)
+		return 0;
 	temp = get_trash_chunk();
-	temp->len = strftime(temp->str, temp->size, args[0].data.str.str, localtime(&curr_date));
+	temp->len = strftime(temp->str, temp->size, args[0].data.str.str, tm);
 	smp->data.str = *temp;
 	smp->type = SMP_T_STR;
 	return 1;
@@ -1549,13 +1553,17 @@ static int sample_conv_utime(const struct arg *args, struct sample *smp, void *p
 {
 	struct chunk *temp;
 	time_t curr_date = smp->data.uint;
+	struct tm *tm;
 
 	/* add offset */
 	if (args[1].type == ARGT_SINT || args[1].type == ARGT_UINT)
 		curr_date += args[1].data.sint;
 
+	tm = gmtime(&curr_date);
+	if (!tm)
+		return 0;
 	temp = get_trash_chunk();
-	temp->len = strftime(temp->str, temp->size, args[0].data.str.str, gmtime(&curr_date));
+	temp->len = strftime(temp->str, temp->size, args[0].data.str.str, tm);
 	smp->data.str = *temp;
 	smp->type = SMP_T_STR;
 	return 1;