Alexandre Julliard : version: Allocate the full virtual size of the section when loading PE resources.

[Alexandre Julliard]

Module: wine
Branch: stable
Commit: 78207750d3794a2b428c433a312203e739f9b33f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=78207750d3794a2b428c433a31...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Mon Mar 14 12:13:39 2011 +0100

version: Allocate the full virtual size of the section when loading PE resources.
(cherry picked from commit 0136bc27d1e3c6420247e393b6ec98a5503f4af2)

---

 dlls/version/resource.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/dlls/version/resource.c b/dlls/version/resource.c
index 64d39dd..5772487 100644
--- a/dlls/version/resource.c
+++ b/dlls/version/resource.c
@@ -220,7 +220,7 @@ static BOOL find_pe_resource( HFILE lzfd, DWORD *resLen, DWORD *resOff )
     PIMAGE_DATA_DIRECTORY resDataDir;
     PIMAGE_SECTION_HEADER sections;
     LPBYTE resSection;
-    DWORD resSectionSize;
+    DWORD section_size, data_size;
     const void *resDir;
     const IMAGE_RESOURCE_DIRECTORY *resPtr;
     const IMAGE_RESOURCE_DATA_ENTRY *resData;
@@ -282,8 +282,9 @@ static BOOL find_pe_resource( HFILE lzfd, DWORD *resLen, DWORD *resOff )
     }
 
     /* Read in resource section */
-    resSectionSize = sections[i].SizeOfRawData;
-    resSection = HeapAlloc( GetProcessHeap(), 0, resSectionSize );
+    data_size = sections[i].SizeOfRawData;
+    section_size = max( data_size, sections[i].Misc.VirtualSize );
+    resSection = HeapAlloc( GetProcessHeap(), 0, section_size );
     if ( !resSection )
     {
         HeapFree( GetProcessHeap(), 0, sections );
@@ -291,7 +292,8 @@ static BOOL find_pe_resource( HFILE lzfd, DWORD *resLen, DWORD *resOff )
     }
 
     LZSeek( lzfd, sections[i].PointerToRawData, SEEK_SET );
-    if ( resSectionSize != LZRead( lzfd, (char*)resSection, resSectionSize ) ) goto done;
+    if (data_size != LZRead( lzfd, (char*)resSection, data_size )) goto done;
+    if (data_size < section_size) memset( (char *)resSection + data_size, 0, section_size - data_size );
 
     /* Find resource */
     resDir = resSection + (resDataDir->VirtualAddress - sections[i].VirtualAddress);