Index: dll/win32/version/version.c
===================================================================
--- dll/win32/version/version.c	(revision 65607)
+++ dll/win32/version/version.c	(working copy)
@@ -937,6 +937,9 @@
 {
     static const char rootA[] = "\\";
     const VS_VERSION_INFO_STRUCT16 *info = pBlock;
+    UINT dum = 0;
+    if (!puLen)
+        puLen = &dum;
 
     TRACE("(%p,%s,%p,%p)\n",
                 pBlock, debugstr_a(lpSubBlock), lplpBuffer, puLen );
@@ -965,7 +968,7 @@
 
         HeapFree(GetProcessHeap(), 0, lpSubBlockW);
 
-        if (ret && isText)
+        if (ret && isText && *puLen)
         {
             /* Set lpBuffer so it points to the 'empty' area where we store
              * the converted strings