msi: Fix integer conversion in get_table_value_from_record.

1257db21 · Hans Leidekker · Alexandre Julliard · 7dfdcf30 · 1257db21
Commit 1257db21 authored Jul 30, 2013 by Hans Leidekker Committed by Alexandre Julliard Jul 30, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 5 deletions

table.c dlls/msi/table.c +11 -5

No files found.
--- a/dlls/msi/table.c
+++ b/dlls/msi/table.c
@@ -1259,6 +1259,7 @@ static UINT get_table_value_from_record( MSITABLEVIEW *tv, MSIRECORD *rec, UINT 
 {
    MSICOLUMNINFO columninfo;
    UINT r;
+    int ival;
    if ( (iField <= 0) ||
         (iField > tv->num_cols) ||
@@ -1285,16 +1286,21 @@ static UINT get_table_value_from_record( MSITABLEVIEW *tv, MSIRECORD *rec, UINT 
    }
    else if ( bytes_per_column( tv->db, &columninfo, LONG_STR_BYTES ) == 2 )
    {
-        *pvalue = 0x8000 + MSI_RecordGetInteger( rec, iField );
+        ival = MSI_RecordGetInteger( rec, iField );
-        if ( *pvalue & 0xffff0000 )
+        if (ival == 0x80000000) *pvalue = 0x8000;
+        else
        {
-            ERR("field %u value %d out of range\n", iField, *pvalue - 0x8000);
+            *pvalue = 0x8000 + MSI_RecordGetInteger( rec, iField );
-            return ERROR_FUNCTION_FAILED;
+            if (*pvalue & 0xffff0000)
+            {
+                ERR("field %u value %d out of range\n", iField, *pvalue - 0x8000);
+                return ERROR_FUNCTION_FAILED;
+            }
        }
    }
    else
    {
-        INT ival = MSI_RecordGetInteger( rec, iField );
+        ival = MSI_RecordGetInteger( rec, iField );
        *pvalue = ival ^ 0x80000000;
    }