Handle 0 length buffers in MSI_FormatRecordW.

Remove unused buffer in deformat_string.

Handle 0 length buffers in MSI_FormatRecordW.
34400353 · Ulrich Czekalla · Alexandre Julliard · 7acd3639 · 34400353 · 34400353
Commit 34400353 authored Feb 09, 2005 by Ulrich Czekalla Committed by Alexandre Julliard Feb 09, 2005
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

action.c dlls/msi/action.c +1 -2

format.c dlls/msi/format.c +5 -2

No files found.
--- a/dlls/msi/action.c
+++ b/dlls/msi/action.c
@@ -518,10 +518,9 @@ DWORD deformat_string(MSIPACKAGE *package, LPCWSTR ptr, WCHAR** data )
    {
        MSIRECORD *rec = MSI_CreateRecord(1);
        DWORD size = 0;
-        WCHAR size_buf[2] = {' ',0};

        MSI_RecordSetStringW(rec,0,ptr);
-        MSI_FormatRecordW(package,rec,size_buf,&size);
+        MSI_FormatRecordW(package,rec,NULL,&size);
        if (size >= 0)
        {
            size++;

--- a/dlls/msi/format.c
+++ b/dlls/msi/format.c
@@ -451,9 +451,12 @@ UINT MSI_FormatRecordW( MSIPACKAGE* package, MSIRECORD* record, LPWSTR buffer,
        }
        else
        {
-            memcpy(buffer,deformated,(*size)*sizeof(WCHAR));
+            if (*size > 0)
+            {
+                memcpy(buffer,deformated,(*size)*sizeof(WCHAR));
+                buffer[(*size)-1] = 0;
+            }
            rc = ERROR_MORE_DATA;
-            buffer[(*size)-1] = 0;    
        }
    }
    else