From 1257db2109ccd81295997d1bf02d80b80944ca5a Mon Sep 17 00:00:00 2001 From: Hans Leidekker Date: Tue, 30 Jul 2013 11:09:54 +0200 Subject: [PATCH] msi: Fix integer conversion in get_table_value_from_record. --- dlls/msi/table.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index e2186fcb3cf..16e31443196 100644 --- 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 ); - if ( *pvalue & 0xffff0000 ) + ival = MSI_RecordGetInteger( rec, iField ); + if (ival == 0x80000000) *pvalue = 0x8000; + else { - ERR("field %u value %d out of range\n", iField, *pvalue - 0x8000); - return ERROR_FUNCTION_FAILED; + *pvalue = 0x8000 + MSI_RecordGetInteger( rec, iField ); + 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; }