generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Work around tzcode's reliance on signed overflow.

Browse Source 
I've mailed the tz list about this, and will switch to whatever upstream
fix comes along as soon as it's available.

Bug: 10310929

(cherry picked from commit 7843d44a59)

Change-Id: I205e2440703444c50cecd91d3458d33613ddbc59
This commit is contained in:
Elliott Hughes 2013-08-22 11:37:32 -07:00
parent 9ef1fbb644
commit f0c10a4a16
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libc/Android.mk
View File

@ -718,6 +718,8 @@ LOCAL_CFLAGS := \
-DTZDIR=\"/system/usr/share/zoneinfo\" \ -DTZDIR=\"/system/usr/share/zoneinfo\" \
-DTM_GMTOFF=tm_gmtoff \ -DTM_GMTOFF=tm_gmtoff \
-DUSG_COMPAT=1 -DUSG_COMPAT=1
# tzcode currently relies on signed overflow in numerous places (http://b/10310929).
LOCAL_CFLAGS += -fno-strict-overflow
LOCAL_C_INCLUDES := $(libc_common_c_includes) LOCAL_C_INCLUDES := $(libc_common_c_includes)
LOCAL_MODULE := libc_tzcode LOCAL_MODULE := libc_tzcode
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk

13
tests/time_test.cpp
View File

@ -54,3 +54,16 @@ TEST(time, gmtime) {
ASSERT_EQ(0, broken_down->tm_mon); ASSERT_EQ(0, broken_down->tm_mon);
ASSERT_EQ(1970, broken_down->tm_year + 1900); ASSERT_EQ(1970, broken_down->tm_year + 1900);
} }
#ifdef __BIONIC__
TEST(time, mktime_10310929) {
struct tm t;
memset(&t, 0, sizeof(tm));
t.tm_year = 200;
t.tm_mon = 2;
t.tm_mday = 10;
ASSERT_EQ(-1, mktime(&t));
ASSERT_EQ(-1, mktime_tz(&t, "UTC"));
}
#endif