# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1155514095 0
# Node ID a82d407d38fad5f159be0c752288ab0a10e34d34
# Parent  eaf7f35635bc174674bf71d8c3d12236d5268119
[gaim-migrate @ 16740]
Fix for CID 97

committer: Tailor Script <tailor@pidgin.im>

diff -r eaf7f35635bc -r a82d407d38fa plugins/log_reader.c
--- a/plugins/log_reader.c	Sun Aug 13 23:30:19 2006 +0000
+++ b/plugins/log_reader.c	Mon Aug 14 00:08:15 2006 +0000
@@ -857,11 +857,10 @@
 				 * friendly name or alias. For this test, "match" is defined as:
 				 * ^(friendly_name|alias)([^a-zA-Z0-9].*)?$
 				 */
-				from_name_matches = from_name != NULL && (
-				                     (gaim_str_has_prefix(from_name, friendly_name) &&
+				from_name_matches = (gaim_str_has_prefix(from_name, friendly_name) &&
 				                      !isalnum(*(from_name + friendly_name_length))) ||
 				                     (gaim_str_has_prefix(from_name, log->account->alias) &&
-				                      !isalnum(*(from_name + alias_length))));
+				                      !isalnum(*(from_name + alias_length)));
 
 				to_name_matches = to_name != NULL && (
 				                   (gaim_str_has_prefix(to_name, friendly_name) &&
@@ -930,10 +929,11 @@
 									!isalnum(*(from_name +
 									friendly_name_length)));
 
-							to_name_matches = (gaim_str_has_prefix(
+							to_name_matches = to_name && (
+									(gaim_str_has_prefix(
 									to_name, buddy->server_alias) &&
 									!isalnum(*(to_name +
-									friendly_name_length)));
+									friendly_name_length))));
 
 							if (from_name_matches) {
 								if (!to_name_matches) {