Mercurial > pidgin.yaz
comparison libgaim/protocols/novell/nmuser.c @ 14659:897d2d09787e
[gaim-migrate @ 17405]
SF Patch #1568062 from Mike Stoddard
"This fixes a crash when processing the contact list
during login. In some cases where there was an invalid
contact in the list, a NULL string was being passed to
g_utf8_strdown causing the segfault."
committer: Tailor Script <tailor@pidgin.im>
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Sat, 30 Sep 2006 03:02:01 +0000 |
parents | 78f121689460 |
children | 71c764f2b1a6 |
comparison
equal
deleted
inserted
replaced
14658:b7b5ff9c04a1 | 14659:897d2d09787e |
---|---|
1135 } | 1135 } |
1136 | 1136 |
1137 void | 1137 void |
1138 nm_user_add_user_record(NMUser * user, NMUserRecord * user_record) | 1138 nm_user_add_user_record(NMUser * user, NMUserRecord * user_record) |
1139 { | 1139 { |
1140 const char *display_id; | |
1141 const char *dn; | |
1142 | |
1143 if (!user || !user_record) | |
1144 return; | |
1145 | |
1146 display_id = nm_user_record_get_display_id(user_record); | |
1147 dn = nm_user_record_get_dn(user_record); | |
1148 | |
1149 if (!dn || !display_id) | |
1150 return; | |
1151 | |
1140 nm_user_record_add_ref(user_record); | 1152 nm_user_record_add_ref(user_record); |
1141 | 1153 |
1142 g_hash_table_insert(user->user_records, | 1154 g_hash_table_insert(user->user_records, |
1143 g_utf8_strdown(nm_user_record_get_dn(user_record), -1), | 1155 g_utf8_strdown(dn, -1), |
1144 user_record); | 1156 user_record); |
1145 | 1157 |
1146 g_hash_table_insert(user->display_id_to_dn, | 1158 g_hash_table_insert(user->display_id_to_dn, |
1147 g_utf8_strdown(nm_user_record_get_display_id(user_record), | 1159 g_utf8_strdown(display_id, -1), |
1148 -1), | 1160 g_utf8_strdown(dn, -1)); |
1149 g_utf8_strdown(nm_user_record_get_dn(user_record), -1)); | |
1150 | |
1151 } | 1161 } |
1152 | 1162 |
1153 nm_event_cb | 1163 nm_event_cb |
1154 nm_user_get_event_callback(NMUser * user) | 1164 nm_user_get_event_callback(NMUser * user) |
1155 { | 1165 { |