[Gaim-commits] SF.net SVN: gaim: [16740] trunk/plugins/log_reader.c

[<dat...@us...>]

Revision: 16740
Author:   datallah
Date:     2006-08-13 17:08:15 -0700 (Sun, 13 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16740&view=rev

Log Message:
-----------
Fix for CID 97

Modified Paths:
--------------
    trunk/plugins/log_reader.c
Modified: trunk/plugins/log_reader.c
===================================================================
--- trunk/plugins/log_reader.c	2006-08-13 23:30:19 UTC (rev 16739)
+++ trunk/plugins/log_reader.c	2006-08-14 00:08:15 UTC (rev 16740)
@@ -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) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.