Mercurial Mercurial > sustaining > oi_151a > spec-files / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/yelp-01-null-frag-id.diff
author dcarbery
Fri, 24 Nov 2006 16:37:59 +0000
branch217update
changeset 19096 d542fc2c823e
parent 8158 6e06af433751
permissions -rw-r--r--
Merged trunk changes r9797:9829 into 217update branch.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
8158
6e06af433751 #6471853 / #318996 - Check for NULL frag_id before strcmp()
mattk
parents:
diff changeset 
     1
 
--- yelp-2.16.0.old/src/yelp-pager.c	2006-09-18 14:52:04.787196000 +0100
6e06af433751 #6471853 / #318996 - Check for NULL frag_id before strcmp()
mattk
parents:
diff changeset 
     2
 
+++ yelp-2.16.0/src/yelp-pager.c	2006-09-18 14:52:39.983264000 +0100
6e06af433751 #6471853 / #318996 - Check for NULL frag_id before strcmp()
mattk
parents:
diff changeset 
     3
 
@@ -393,7 +393,10 @@
6e06af433751 #6471853 / #318996 - Check for NULL frag_id before strcmp()
mattk
parents:
diff changeset 
     4
 
     const gchar *frag_page_id =
6e06af433751 #6471853 / #318996 - Check for NULL frag_id before strcmp()
mattk
parents:
diff changeset 
     5
 
 	YELP_PAGER_GET_CLASS (pager)->resolve_frag (pager, frag_id);
6e06af433751 #6471853 / #318996 - Check for NULL frag_id before strcmp()
mattk
parents:
diff changeset 
     6
6e06af433751 #6471853 / #318996 - Check for NULL frag_id before strcmp()
mattk
parents:
diff changeset 
     7
 
-    return !strcmp (frag_page_id, page_id);
6e06af433751 #6471853 / #318996 - Check for NULL frag_id before strcmp()
mattk
parents:
diff changeset 
     8
 
+	if (frag_page_id)
6e06af433751 #6471853 / #318996 - Check for NULL frag_id before strcmp()
mattk
parents:
diff changeset 
     9
 
+    	return !strcmp (frag_page_id, page_id);
6e06af433751 #6471853 / #318996 - Check for NULL frag_id before strcmp()
mattk
parents:
diff changeset 
    10
 
+	else
6e06af433751 #6471853 / #318996 - Check for NULL frag_id before strcmp()
mattk
parents:
diff changeset 
    11
 
+		return FALSE;
6e06af433751 #6471853 / #318996 - Check for NULL frag_id before strcmp()
mattk
parents:
diff changeset 
    12
 
 }
6e06af433751 #6471853 / #318996 - Check for NULL frag_id before strcmp()
mattk
parents:
diff changeset 
    13
6e06af433751 #6471853 / #318996 - Check for NULL frag_id before strcmp()
mattk
parents:
diff changeset 
    14
 
 const YelpPage *
sustaining/oi_151a/spec-files