diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2014-02-25 16:58:06 +0000 |
|---|---|---|
| committer | CI bot <ps-jenkins@lists.canonical.com> | 2014-02-25 16:58:06 +0000 |
| commit | 3a379eaffa05fcf35e2960aca2b95c9573d6efee (patch) | |
| tree | ed94e4501e5c6fbd57cc6d43e940b582736c2a1c | |
| parent | e3ce38f4690f01968fb9cc5da5aa606fe9fcc499 (diff) | |
| parent | d8dcf6f405334a8438f732ae3e3ae970b54109a2 (diff) | |
| download | ayatana-indicator-datetime-3a379eaffa05fcf35e2960aca2b95c9573d6efee.tar.gz ayatana-indicator-datetime-3a379eaffa05fcf35e2960aca2b95c9573d6efee.tar.bz2 ayatana-indicator-datetime-3a379eaffa05fcf35e2960aca2b95c9573d6efee.zip | |
Test the EClient's color hint string for NULL before passing it to a std::string constructor. Fixes: 1283834
| -rw-r--r-- | src/planner-eds.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/planner-eds.cpp b/src/planner-eds.cpp index 7d9416c..61719ea 100644 --- a/src/planner-eds.cpp +++ b/src/planner-eds.cpp @@ -289,7 +289,11 @@ private: ECalClient* client; std::string color; AppointmentSubtask(const std::shared_ptr<Task>& task_in, ECalClient* client_in, const char* color_in): - task(task_in), client(client_in), color(color_in) {} + task(task_in), client(client_in) + { + if (color_in) + color = color_in; + } }; void rebuild_soon(int rebuild_flags) |