msi: Avoid crashing if writeout_cabinet_stream fails.

b851d465 · Mike McCormack · Alexandre Julliard · 9375fd9f · b851d465
Commit b851d465 authored Oct 27, 2006 by Mike McCormack Committed by Alexandre Julliard Oct 27, 2006
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 3 deletions

files.c dlls/msi/files.c +8 -3

No files found.
--- a/dlls/msi/files.c
+++ b/dlls/msi/files.c
@@ -490,11 +490,16 @@ static UINT ready_media_for_file( MSIPACKAGE *package, struct media_info *mi,
        /* the stream does not contain the # character */
        if (cab[0]=='#')
        {
-            LPWSTR path;
+            LPWSTR path, p;
+
+            rc = writeout_cabinet_stream(package,&cab[1],mi->source);
+            if (rc != ERROR_SUCCESS)
+                return rc;

-            writeout_cabinet_stream(package,&cab[1],mi->source);
            mi->last_path = strdupW(mi->source);
-            *(strrchrW(mi->last_path,'\\')+1)=0;
+            p = strrchrW(mi->last_path,'\\');
+            if (p)
+                p[1] = 0;

            path = msi_dup_property( package, cszSourceDir );