Merge branch 'v2017'

Author: derickr

Makefile

@@ -8,12 +8,13 @@ CFLAGS=-Wdeclaration-after-statement ${FLAGS}
 
 CPPFLAGS=${FLAGS}
 
-LDFLAGS=-lm -fsanitize=undefined -l:libubsan.so.1
+LDFLAGS=-lm -fsanitize=undefined -l:libubsan.so
 
 TEST_LDFLAGS=-lCppUTest
 
-CC=gcc-8
-CXX=g++-8
+CC=gcc
+CXX=g++
+
 MANUAL_TESTS=tests/tester-parse-interval \
 	tests/tester-parse-tz tests/tester-iso-week tests/test-abbr-to-id \
 	tests/enumerate-timezones tests/date_from_isodate

tests/c/issues.cpp

@@ -1,5 +1,6 @@
 #include "CppUTest/TestHarness.h"
 #include "timelib.h"
+#include <string.h>
 
 TEST_GROUP(issues)
 {
@@ -439,6 +440,38 @@ TEST(issues, issue0065_test2)
 	offset = timelib_get_time_zone_info(-3852662325, tzi);
 	LONGS_EQUAL(-3852662325, offset->transition_time);
 	timelib_time_offset_dtor(offset);
+	timelib_tzinfo_dtor(tzi);
+}
+
+TEST(issues, issue0069)
+{
+	char            str1[] = "2019-10-14T15:08:23.123+02:00";
+	char            str2[] = "-50000 msec";
+	timelib_time   *t1    = timelib_strtotime(str1, sizeof(str1), NULL, timelib_builtin_db(), timelib_parse_tzfile);
+	timelib_time   *t2    = timelib_strtotime(str2, sizeof(str2), NULL, timelib_builtin_db(), timelib_parse_tzfile);
+	int             dummy_error;
+	timelib_tzinfo *tzi;
+
+	tzi = timelib_parse_tzfile((char*) "UTC", timelib_builtin_db(), &dummy_error);
+
+	timelib_update_ts(t1, tzi);
+
+	memcpy(&t1->relative, &t2->relative, sizeof(timelib_rel_time));
+	t1->have_relative = 1;
+	t1->sse_uptodate = 0;
+
+	timelib_update_ts(t1, NULL);
+	timelib_update_from_sse(t1);
+	t1->have_relative = 0;
 
+	memset(&t1->relative, 0, sizeof(timelib_rel_time));
+
+	LONGS_EQUAL(123000, t1->us);
+	LONGS_EQUAL(33, t1->s);
+	LONGS_EQUAL( 7, t1->i);
+	LONGS_EQUAL(15, t1->h);
+
+	timelib_time_dtor(t1);
+	timelib_time_dtor(t2);
 	timelib_tzinfo_dtor(tzi);
 }

tm2unixtime.c

@@ -33,18 +33,6 @@ static int month_tab[12]          = {   0,  31,  59,  90, 120, 151, 181, 212, 24
 static int days_in_month_leap[13] = {  31,  31,  29,  31,  30,  31,  30,  31,  31,  30,  31,  30,  31 };
 static int days_in_month[13]      = {  31,  31,  28,  31,  30,  31,  30,  31,  31,  30,  31,  30,  31 };
 
-static void do_range_limit_fraction(timelib_sll *fraction, timelib_sll *seconds)
-{
-	if (*fraction < 0) {
-		*fraction += 1000000;
-		*seconds -= 1;
-	}
-	if (*fraction >= 1000000) {
-		*fraction -= 1000000;
-		*seconds += 1;
-	}
-}
-
 static void do_range_limit(timelib_sll start, timelib_sll end, timelib_sll adj, timelib_sll *a, timelib_sll *b)
 {
 	if (*a < start) {
@@ -194,7 +182,7 @@ static void do_adjust_for_weekday(timelib_time* time)
 
 void timelib_do_rel_normalize(timelib_time *base, timelib_rel_time *rt)
 {
-	do_range_limit_fraction(&rt->us, &rt->s);
+	do_range_limit(0, 1000000, 1000000, &rt->us, &rt->s);
 	do_range_limit(0, 60, 60, &rt->s, &rt->i);
 	do_range_limit(0, 60, 60, &rt->i, &rt->h);
 	do_range_limit(0, 24, 24, &rt->h, &rt->d);
@@ -234,7 +222,7 @@ static void magic_date_calc(timelib_time *time)
 
 void timelib_do_normalize(timelib_time* time)
 {
-	if (time->us != TIMELIB_UNSET) do_range_limit_fraction(&time->us, &time->s);
+	if (time->us != TIMELIB_UNSET) do_range_limit(0, 1000000, 1000000, &time->us, &time->s);
 	if (time->s != TIMELIB_UNSET) do_range_limit(0, 60, 60, &time->s, &time->i);
 	if (time->s != TIMELIB_UNSET) do_range_limit(0, 60, 60, &time->i, &time->h);
 	if (time->s != TIMELIB_UNSET) do_range_limit(0, 24, 24, &time->h, &time->d);