oleaut32: Fix ctl2_alloc_importfile offset calculations.

9724c6d7 · Andrey Turkin · Alexandre Julliard · 18b310a7 · 9724c6d7
Commit 9724c6d7 authored May 22, 2010 by Andrey Turkin Committed by Alexandre Julliard May 24, 2010
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

typelib2.c dlls/oleaut32/typelib2.c +2 -2

No files found.
--- a/dlls/oleaut32/typelib2.c
+++ b/dlls/oleaut32/typelib2.c
@@ -779,8 +779,8 @@ static int ctl2_alloc_importfile(
    encoded_string[0] |= 1;

    for (offset = 0; offset < This->typelib_segdir[MSFT_SEG_IMPORTFILES].length;
-	 offset += ((((This->typelib_segment_data[MSFT_SEG_IMPORTFILES][offset + 0xd] << 8) & 0xff)
-	     | (This->typelib_segment_data[MSFT_SEG_IMPORTFILES][offset + 0xc] & 0xff)) >> 2) + 0xc) {
+	 offset += ((((((This->typelib_segment_data[MSFT_SEG_IMPORTFILES][offset + 0xd] << 8) & 0xff00)
+	     | (This->typelib_segment_data[MSFT_SEG_IMPORTFILES][offset + 0xc] & 0xff)) >> 2) + 5) & 0xfffc) + 0xc) {
 	if (!memcmp(encoded_string, This->typelib_segment_data[MSFT_SEG_IMPORTFILES] + offset + 0xc, length)) return offset;
    }