From 58f4cf1dfb0d05121eb1ca7e9570a35f81a257af Mon Sep 17 00:00:00 2001 From: Tomasz Marciniak Date: Thu, 3 Sep 2015 14:00:25 +0200 Subject: [PATCH] [Time] Fix for getting region. [Verification] Code compiles. TCT pass rate 100% (r38) Change-Id: I4ddcc7e991c0a90f57f7a141a41028f4a1db9171 Signed-off-by: Tomasz Marciniak --- src/time/time_instance.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/time/time_instance.cc b/src/time/time_instance.cc index a2e427df..d9252f11 100644 --- a/src/time/time_instance.cc +++ b/src/time/time_instance.cc @@ -433,8 +433,8 @@ Locale* TimeInstance::getDefaultLocale() { char *str_region = NULL; char* p = strchr(tempstr, '.'); - int len = strlen(tempstr) - strlen(".UTF-8"); - if (p && len > 0) { + int len = strlen(tempstr) - (p != nullptr ? strlen(p) : 0); + if (len > 0) { str_region = strndup(tempstr, len); //.UTF8 => 5 defaultLocale = new Locale(str_region); } -- 2.34.1