Index: cmapi.c
===================================================================
--- cmapi.c	(revision 34226)
+++ cmapi.c	(working copy)
@@ -337,6 +337,13 @@
     Parent = (PCM_KEY_NODE)HvGetCell(Hive, Cell);
     Count = Parent->ValueList.Count;
     Found = FALSE;
+
+    if (Parent->MaxValueNameLen != Kcb->KcbMaxValueNameLen)
+    {
+        Status = STATUS_INVALID_PARAMETER;
+        goto Quickie;
+    }
+
     if (Count > 0)
     {
         /* Try to find the existing name */