summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChunEon Park <hermet@hermet.pe.kr>2015-06-15 13:39:14 +0900
committerChunEon Park <hermet@hermet.pe.kr>2015-06-15 13:39:14 +0900
commitdd592451b8a65cb1a444691a88cef1d3fcc19fb2 (patch)
tree378418504d9ffd784574ce12087bcc2a0d5bf2cf
parent8ee96d16f1e311bbd08c992d45df83a415a36510 (diff)
downloadelementary-dd592451b8a65cb1a444691a88cef1d3fcc19fb2.tar.gz
clendar: + null check
gmtime can return NULL vaule. if so strftime will cause crash. this patch just prevent that potential situation.
-rw-r--r--src/lib/elm_calendar.c24
1 files changed, 15 insertions, 9 deletions
diff --git a/src/lib/elm_calendar.c b/src/lib/elm_calendar.c
index 0fc78f338..90a6f17ab 100644
--- a/src/lib/elm_calendar.c
+++ b/src/lib/elm_calendar.c
@@ -1004,17 +1004,23 @@ _elm_calendar_evas_object_smart_add(Eo *obj, Elm_Calendar_Data *priv)
/* FIXME: I'm not aware of a known max, so if it fails,
* just make it larger. :| */
char buf[20];
+ struct tm *info;
+
/* I don't know of a better way of doing it */
- if (strftime(buf, sizeof(buf), "%a", gmtime(&weekday)))
+ info = gmtime(&weekday);
+ if (info)
{
- priv->weekdays[i] = eina_stringshare_add(buf);
- }
- else
- {
- /* If we failed getting day, get a default value */
- priv->weekdays[i] = _days_abbrev[i];
- WRN("Failed getting weekday name for '%s' from locale.",
- _days_abbrev[i]);
+ if (strftime(buf, sizeof(buf), "%a", info))
+ {
+ priv->weekdays[i] = eina_stringshare_add(buf);
+ }
+ else
+ {
+ /* If we failed getting day, get a default value */
+ priv->weekdays[i] = _days_abbrev[i];
+ WRN("Failed getting weekday name for '%s' from locale.",
+ _days_abbrev[i]);
+ }
}
weekday += 86400; /* Advance by a day */
}