Explain apples/oranges comparison and fix compilation error.

reviewed by: plam

2 files changed, 11 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 8b9c55d3..330e7687 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,13 @@
 
 	* src/fcfs.c (FcFontSetUnserialize):
 
+	Explain apples/oranges comparison and fix compilation error.
+
+2006-02-06  Dirk Mueller  <dmueller@suse.de>
+	reviewed by: plam
+
+	* src/fcfs.c (FcFontSetUnserialize):
+
 	Insert check for integer overflow in # of fonts.
 
 2006-02-04  Behdad Esfahbod  <behdad@cs.toronto.edu>
diff --git a/src/fcfs.c b/src/fcfs.c
index 50049bac..cbb5dc7f 100644
--- a/src/fcfs.c
+++ b/src/fcfs.c
@@ -159,7 +159,10 @@ FcFontSetUnserialize(FcCache * metadata, FcFontSet * s, void * block_ptr)
     nfont = *(int *)block_ptr;
     block_ptr = (int *)block_ptr + 1;
 
-    if (nfont > 0 && nfont < metadata.count)
+    /* comparing nfont and metadata.count is a bit like comparing
+       apples and oranges. Its just for rejecting totally insane
+       nfont values, and for that its good enough */
+    if (nfont > 0 && nfont < metadata->count / sizeof(void*))
     {
 	FcPattern * p = (FcPattern *)block_ptr;