--- a/src/dcf.c	Tue Aug 30 12:14:34 2011 +0200
+++ b/src/dcf.c	Mon Sep 12 10:52:02 2011 +0200
@@ -97,7 +97,7 @@
     /* If DCF entry do not exist... Nothing to do.*/
     if (errorCode != OD_SUCCESSFUL) goto DCF_finish;
   }
-
+  if(d->dcf_odentry->bSubCount<=nodeId) goto DCF_finish; /* Fix DCF table overflow */
   szData = d->dcf_odentry->pSubindex[nodeId].size;
   
   /* if the entry for the nodeId is not empty. */