Commit 50bc2ead authored by Travis Reitter's avatar Travis Reitter
Browse files

Ensure NameDetails public strings are non-null as we promise.

Closes: bug#663889 - crash due to NameDetails which fail to guarantee
non-null full-name/nickname
parent dbe20794
......@@ -3,6 +3,8 @@ Overview of changes from libfolks 0.6.5 to libfolks 0.6.6
Bugs fixed:
* Bug 664158 — Stale log handler can cause segfault when re-creating Aggregator
in a single run
* Bug 663889 — crash due to NameDetails which fail to guarantee
non-null full-name/nickname
Overview of changes from libfolks 0.6.4.1 to libfolks 0.6.5
=============================================================
......
......@@ -700,6 +700,8 @@ public class Edsf.Persona : Folks.Persona,
var full_name =
(string) Edsf.Persona._get_property_from_contact (contact,
"full_name");
if (full_name == null)
full_name = "";
debug ("Creating new Edsf.Persona with IID '%s'", iid);
......
......@@ -752,6 +752,8 @@ public class Tpf.Persona : Folks.Persona,
else if (info.field_name == "fn")
{
new_full_name = info.field_value[0];
if (new_full_name == null)
new_full_name = "";
}
else if (info.field_name == "tel")
{
......
......@@ -1102,6 +1102,8 @@ public class Trf.Persona : Folks.Persona,
var proto = addr_info[Trf.IMFields.PROTO];
var account_id = addr_info[Trf.IMFields.ID];
var nickname = addr_info[Trf.IMFields.IM_NICKNAME];
if (nickname == null)
nickname = "";
this._update_nickname (nickname);
this._add_im_address (tracker_id, proto, account_id, false);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment