aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2014-02-25 16:58:15 +0000
committerCI bot <ps-jenkins@lists.canonical.com>2014-02-25 16:58:15 +0000
commitd31981afaf5f38cb3c07e1d4bc60a3c5b93104d0 (patch)
treec57c20e732a8f5f7c03a5ffb52c112e99ef65538
parent3a379eaffa05fcf35e2960aca2b95c9573d6efee (diff)
parentcd7552c4476b330b48116620b00000f65863ddaf (diff)
downloadayatana-indicator-datetime-d31981afaf5f38cb3c07e1d4bc60a3c5b93104d0.tar.gz
ayatana-indicator-datetime-d31981afaf5f38cb3c07e1d4bc60a3c5b93104d0.tar.bz2
ayatana-indicator-datetime-d31981afaf5f38cb3c07e1d4bc60a3c5b93104d0.zip
Test the EDS component summary for NULL before using it in a std::string. Fixes: 1280341
-rw-r--r--src/planner-eds.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/planner-eds.cpp b/src/planner-eds.cpp
index 61719ea..c4d2932 100644
--- a/src/planner-eds.cpp
+++ b/src/planner-eds.cpp
@@ -467,14 +467,15 @@ private:
e_cal_component_free_recur_list(recur_list);
ECalComponentText text;
- text.value = "";
+ text.value = nullptr;
e_cal_component_get_summary(component, &text);
+ if (text.value)
+ appointment.summary = text.value;
appointment.begin = DateTime(begin);
appointment.end = DateTime(end);
appointment.color = subtask->color;
appointment.is_event = vtype == E_CAL_COMPONENT_EVENT;
- appointment.summary = text.value;
appointment.uid = uid;
GList * alarm_uids = e_cal_component_get_alarm_uids(component);